[Jamwiki-commit] SF.net SVN: jamwiki:[2925] wiki/branches/wrh2

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

Revision: 2925
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2925&view=rev
Author:   wrh2
Date:     2010-03-06 20:36:31 +0000 (Sat, 06 Mar 2010)

Log Message:
-----------
Merge:
  * Merge latest changes from trunk.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/StyleSheet.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-maintenance.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-manage.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-roles.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin-translation.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/admin.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/login.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/move.jsp
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/WEB-INF/jsp/register.jsp
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UpgradeServlet.java

Property Changed:
----------------
    wiki/branches/wrh2/


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