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

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

Revision: 2954
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2954&view=rev
Author:   wrh2
Date:     2010-03-19 01:20:55 +0000 (Fri, 19 Mar 2010)

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

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_de.properties
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/EditServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/JAMWikiServlet.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/ServletUtil.java
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/UploadServlet.java

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


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