reverse merge from 1.6.0 (r10563)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10711 201d5d3c-b55e-5fd7-737f-ddc643e51545
2026-04-29 15:22:15 +09:00 · 2012-05-17 00:57:29 +00:00 · 2012-05-17 00:57:29 +00:00 · f0aa085c94
commit f0aa085c94
parent 09dc853b4d
9 changed files with 292 additions and 53 deletions
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@ -854,4 +854,4 @@
        }

    }
-?>
+?>