merger from branch luminous (~r11576)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11580 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-10-04 05:04:23 +00:00
commit 51bb8d1985
91 changed files with 1157 additions and 703 deletions

View file

@ -24,4 +24,4 @@
<h3>Main page decoration</h3>
<p>After login as administrator, you can edit the 'main page' by click the '<a href="{geturl('act','dispPageAdminContentModify')}">Modify...</a>' button.</p>
</section>
</article>
</article>