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

@ -30,7 +30,7 @@
<tr>
<th scope="row"><label for="feed_description">{$lang->description}</label></th>
<td class="text">
<textarea name="feed_description" id="feed_description">{$rss_config->feed_description}</textarea>
<textarea name="feed_description" id="feed_description" rows="8" cols="42">{$rss_config->feed_description}</textarea>
<p class="desc">{$lang->about_feed_description}</p>
</td>
</tr>