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

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

Revision: 3226
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3226&view=rev
Author:   wrh2
Date:     2010-09-23 06:29:26 +0000 (Thu, 23 Sep 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/parser/jflex/AbstractHeadingTag.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/JFlexParser.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TemplateInfinite2
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Template_-_Infinite
    wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ExcessiveNestingException.java
    wiki/trunk/jamwiki-core/src/test/resources/data/results/Transclusion1
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/Transclusion1

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


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