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

@ -26,7 +26,7 @@
<!--@end-->
<tr>
<th scope="row">{$lang->description}</th>
<td ><textarea name="description">{$selected_group->description}</textarea></td>
<td ><textarea name="description" rows="8" cols="42">{$selected_group->description}</textarea></td>
</tr>
<tr>
<th scope="row">{$lang->group_image_mark}</th>