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

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

Revision: 3475
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3475&view=rev
Author:   wrh2
Date:     2011-02-20 00:43:06 +0000 (Sun, 20 Feb 2011)

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

Modified Paths:
--------------
    wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt

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


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