[Jamwiki-commit] SF.net SVN: jamwiki:[2910] wiki/branches/wrh2

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

Revision: 2910
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=2910&view=rev
Author:   wrh2
Date:     2010-03-03 06:55:54 +0000 (Wed, 03 Mar 2010)

Log Message:
-----------
Merge:
  * Merge latest changes from trunk.

Modified Paths:
--------------
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
    wiki/branches/wrh2/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/branches/wrh2/jamwiki-core/src/test/java/org/jamwiki/parser/ParserTest.java
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template5
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template5
    wiki/branches/wrh2/jamwiki-war/src/main/resources/ApplicationResources_zh_CN.properties
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/BottomArea.txt
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/de/BottomArea.txt
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/es/BottomArea.txt
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/gl/BottomArea.txt
    wiki/branches/wrh2/jamwiki-war/src/main/resources/pages/zh-TW/BottomArea.txt
    wiki/branches/wrh2/jamwiki-war/src/main/webapp/CHANGELOG.txt
    wiki/branches/wrh2/jamwiki-web/src/main/java/org/jamwiki/servlets/MoveServlet.java

Added Paths:
-----------
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Ifeq
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/results/Template_-_Paramtest
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Ifeq
    wiki/branches/wrh2/jamwiki-core/src/test/resources/data/topics/Template_-_Paramtest

Property Changed:
----------------
    wiki/branches/wrh2/


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