[Jamwiki-commit] SF.net SVN: jamwiki:[3106] wiki/trunk

[<wr...@us...>]

Revision: 3106
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3106&view=rev
Author:   wrh2
Date:     2010-06-19 17:09:13 +0000 (Sat, 19 Jun 2010)

Log Message:
-----------
Merge:
  * Merge changes from the 0.9.x branch to trunk.

Modified Paths:
--------------
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_hu.properties
    wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/trunk/jamwiki-war/src/main/webapp/CREDITS.txt
    wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/edit.jsp
    wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/printable.jsp
    wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/topic.jsp
    wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/view-topic-include.jsp

Added Paths:
-----------
    wiki/trunk/jamwiki-war/src/main/webapp/WEB-INF/jsp/view-category-include.jsp

Property Changed:
----------------
    wiki/trunk/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.