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

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

Revision: 3309
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3309&view=rev
Author:   wrh2
Date:     2010-12-11 02:24:22 +0000 (Sat, 11 Dec 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-war/src/main/webapp/CHANGELOG.txt
    wiki/trunk/jamwiki-war/src/main/webapp/UPGRADE.txt

Added Paths:
-----------
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TableOfContents6
    wiki/trunk/jamwiki-core/src/test/resources/data/results/TableOfContents7
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/TableOfContents6
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/TableOfContents7

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


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