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

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

Revision: 2514
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2514&view=rev
Author:   wrh2
Date:     2009-03-10 14:29:59 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
Merge:
  * Merge pending bugfixes from the 0.7.x branch.
  * Remove problematic merge properties for WikiUserDetails - as far as I understand
    the situation Subversion prior to 1.5.4 calculates merge properties incorrectly
    in some cases.

Modified Paths:
--------------
    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/WEB-INF/applicationContext-security.xml

Property Changed:
----------------
    wiki/trunk/
    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.