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

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

Revision: 3137
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3137&view=rev
Author:   wrh2
Date:     2010-07-24 16:51:18 +0000 (Sat, 24 Jul 2010)

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

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/WikiMessage.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/ParserOutput.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ParserFunctionUtil.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/jflex/ParserTest.java
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Magic_Words1
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Magic_Words2
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Magic_Words1
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Magic_Words2
    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/ServletUtil.java

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


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