[Jamwiki-commit] SF.net SVN: jamwiki:[4311] wiki/branches/pitpalme

[<pit...@us...>]

Revision: 4311
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=4311&view=rev
Author:   pitpalme
Date:     2013-03-08 22:07:43 +0000 (Fri, 08 Mar 2013)
Log Message:
-----------
Merge:
 * Merge trunk back to branch.

Modified Paths:
--------------
    wiki/branches/pitpalme/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/pitpalme/jamwiki-war/src/main/webapp/CREDITS.txt
    wiki/branches/pitpalme/pom.xml

Property Changed:
----------------
    wiki/branches/pitpalme/

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