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

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

Revision: 3396
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3396&view=rev
Author:   wrh2
Date:     2011-01-03 17:59:24 +0000 (Mon, 03 Jan 2011)

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/JavascriptTag.java
    wiki/trunk/jamwiki-core/src/main/jflex/jamwiki-postprocessor.jflex
    wiki/trunk/jamwiki-core/src/test/java/org/jamwiki/parser/jflex/ParserTest.java
    wiki/trunk/jamwiki-core/src/test/resources/data/results/HtmlXSS1
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/HtmlXSS1
    wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt

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


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