Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30
parent 2bec345a46 d0fc397fe1
commit a2f78a6d38
175 changed files with 76587 additions and 70379 deletions
--- a/error.php
+++ b/error.php
@@ -9,7 +9,7 @@
 /**
 * Input sanitizing.
 */
-require_once './libraries/sanitizing.lib.php';
+require './libraries/sanitizing.lib.php';

 /* Get variables */
 if (! empty($_REQUEST['lang']) && is_string($_REQUEST['lang'])) {