[Jamwiki-commit] SF.net SVN: jamwiki:[2584] wiki/branches/frafu

[<sd...@us...>]

Revision: 2584
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2584&view=rev
Author:   sdff
Date:     2009-05-05 14:12:36 +0000 (Tue, 05 May 2009)

Log Message:
-----------
merge trunk to frafu

Modified Paths:
--------------
    wiki/branches/frafu/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/BlikiParser.java
    wiki/branches/frafu/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMHTMLConverter.java
    wiki/branches/frafu/addons/bliki-parser/src/main/java/org/jamwiki/parser/bliki/JAMWikiModel.java
    wiki/branches/frafu/jamwiki-core/src/main/java/org/jamwiki/parser/ParserUtil.java
    wiki/branches/frafu/jamwiki-core/src/main/java/org/jamwiki/parser/TableOfContents.java
    wiki/branches/frafu/jamwiki-war/src/main/resources/ApplicationResources_ru.properties
    wiki/branches/frafu/jamwiki-war/src/main/resources/ApplicationResources_zh_CN.properties
    wiki/branches/frafu/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/frafu/jamwiki-war/src/main/webapp/UPGRADE.txt
    wiki/branches/frafu/jamwiki-war/src/main/webapp/WEB-INF/jsp/edit.jsp
    wiki/branches/frafu/jamwiki-war/src/main/webapp/WEB-INF/jsp/move.jsp
    wiki/branches/frafu/jamwiki-war/src/main/webapp/WEB-INF/jsp/topic.jsp
    wiki/branches/frafu/jamwiki-web/src/main/java/org/jamwiki/servlets/AdminServlet.java
    wiki/branches/frafu/jamwiki-web/src/main/java/org/jamwiki/servlets/TopicServlet.java

Property Changed:
----------------
    wiki/branches/frafu/
    wiki/branches/frafu/jamwiki-war/src/main/resources/pages/ru/
    wiki/branches/frafu/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.