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

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

Revision: 2574
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2574&view=rev
Author:   wrh2
Date:     2009-04-12 18:12:20 +0000 (Sun, 12 Apr 2009)

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

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/TableOfContents.java
    wiki/trunk/jamwiki-war/src/main/resources/ApplicationResources_ru.properties
    wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/trunk/jamwiki-web/src/main/java/org/jamwiki/servlets/TopicServlet.java

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.