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

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

Revision: 3501
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3501&view=rev
Author:   wrh2
Date:     2011-03-12 21:46:24 +0000 (Sat, 12 Mar 2011)

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

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/resources/sql/sql.mssql.properties
    wiki/trunk/jamwiki-war/src/main/resources/spam-blacklist.txt
    wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt

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


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