reverse merge from 1.6.0 (r10563)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10716 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-17 06:12:20 +00:00
parent 57a0cc59b1
commit a4b3a914a5
6 changed files with 10 additions and 11 deletions

View file

@ -854,4 +854,4 @@
}
}
?>
?>