merge from branch 1.5.3.2 (~r11282)

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11380 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-19 07:56:40 +00:00
commit 9f5e25a15e
136 changed files with 414 additions and 317 deletions

View file

@ -1,4 +1,4 @@
<script>//<![CDATA[
<script type="text/javascript">//<![CDATA[
alert('{$msg}');
top.location.href = top.location.href;
//]]></script>