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

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

Revision: 4196
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=4196&view=rev
Author:   wrh2
Date:     2012-10-01 19:07:22 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Merge:
  * Merge changes from the 1.2.x branch to trunk.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/Category.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/ImageData.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/LogItem.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/RecentChange.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/Role.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/Watchlist.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/WikiFile.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/WikiFileVersion.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/WikiGroup.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/WikiReference.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/model/WikiUserDetails.java
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_cs.properties
    wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/trunk/pom.xml

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

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