merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -4,7 +4,7 @@
</tables>
<columns>
<column name="title" var="title" />
<column name="description" var="description" />
<column name="description" var="description" default=""/>
<column name="list_order" var="list_order" />
<column name="last_update" var="last_update" default="curdate()" />
<column name="expand" var="expand" />