Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
diff --git a/application/config/config.php b/application/config/config.php
index a844f71..5c6cc0a 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -188,7 +188,7 @@
|--------------------------------------------------------------------------
|
| Leave this BLANK unless you would like to set something other than the default
-| system/logs/ folder. Use a full server path with trailing slash.
+| application/logs/ folder. Use a full server path with trailing slash.
|
*/
$config['log_path'] = '';
diff --git a/system/core/URI.php b/system/core/URI.php
index 479a225..769dacd 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -642,7 +642,7 @@
*/
function ruri_string()
{
- return '/'.implode('/', $this->rsegment_array()).'/';
+ return '/'.implode('/', $this->rsegment_array());
}
}