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

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

Revision: 4262
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=4262&view=rev
Author:   wrh2
Date:     2013-01-23 05:33:50 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Merge:
  * Merge changes from the 1.2.x branch to trunk.

Modified Paths:
--------------
    wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/ImageServlet.java

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

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