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

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

Revision: 2602
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2602&view=rev
Author:   wrh2
Date:     2009-05-31 20:55:44 +0000 (Sun, 31 May 2009)

Log Message:
-----------
MERGE:
  * Reintegrate changes from the 0.7.x branch.

Modified Paths:
--------------
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_fr.properties
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_ru.properties
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_zh_CN.properties
    wiki/trunk/jamwiki-war/src/main/resources/spam-blacklist.txt
    wiki/trunk/jamwiki-war/src/main/resources/sql.ansi.properties
    wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/trunk/jamwiki-war/src/main/webapp/CREDITS.txt
    wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/db/DatabaseUpgrades.java
    wiki/trunk/pom.xml

Property Changed:
----------------
    wiki/trunk/
    wiki/trunk/jamwiki-war/src/main/resources/pages/ru/
    wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/authentication/WikiUserDetails.java


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