[Jamwiki-commit] SF.net SVN: jamwiki:[3105] wiki/branches/0.9.x

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

Revision: 3105
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3105&view=rev
Author:   wrh2
Date:     2010-06-19 17:02:48 +0000 (Sat, 19 Jun 2010)

Log Message:
-----------
Merge:
  * Merge bugfix from trunk.

Modified Paths:
--------------
    wiki/branches/0.9.x/jamwiki-core/src/main/jflex/jamwiki-preprocessor.jflex
    wiki/branches/0.9.x/jamwiki-core/src/main/jflex/jamwiki-processor.jflex
    wiki/branches/0.9.x/jamwiki-core/src/test/resources/data/results/HtmlBasicLinks2
    wiki/branches/0.9.x/jamwiki-core/src/test/resources/data/topics/HtmlBasicLinks2
    wiki/branches/0.9.x/jamwiki-war/src/main/webapp/CHANGELOG.txt

Property Changed:
----------------
    wiki/branches/0.9.x/


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