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

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

Revision: 4182
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=4182&view=rev
Author:   wrh2
Date:     2012-09-19 05:00:48 +0000 (Wed, 19 Sep 2012)
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/CREDITS.txt
    wiki/trunk/pom.xml

Added Paths:
-----------
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_cs.properties

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

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