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

@ -8,7 +8,7 @@
<language>{$info->language}</language>
<pubDate>{$info->date}</pubDate>
<lastBuildDate>{$info->date}</lastBuildDate>
<generator>XpressEngine {__ZBXE_VERSION__}</generator>
<generator>XpressEngine</generator>
<!--@if($info->feed_copyright)-->
<copyright>{$info->feed_copyright}</copyright>
<!--@end-->