merging refs/remotes/origin/master into HEAD

fernandocarletti · Nov 30, 2010 · b19d597 · b19d597
2 parents 974b266 + bc28bd7
commit b19d597
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 4 deletions.
diff --git a/.buildpath b/.buildpath
diff --git a/.project b/.project
diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs
diff --git a/README b/README
@@ -52,7 +52,4 @@ params. if you don't set action param,
 
 	Functions:
 	url: to params defines all links to your application using kohana
-url::site() function.
-
-Classes
-	Korty_Main
+url::site() function.