merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -8,6 +8,8 @@
<column name="nick_name" var="nick_name" notnull="notnull" minlength="2" maxlength="40" />
<column name="user_id" var="user_id" notnull="notnull" />
<column name="email_address" var="email_address" notnull="notnull"/>
<column name="email_id" var="email_id" />
<column name="email_host" var="email_host" />
<column name="find_account_question" var="find_account_question" />
<column name="find_account_answer" var="find_account_answer" default="" />
<column name="homepage" var="homepage" default="" />