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

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

Revision: 4268
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=4268&view=rev
Author:   wrh2
Date:     2013-01-26 07:04:19 +0000 (Sat, 26 Jan 2013)
Log Message:
-----------
Merge:
  * Merge changes from the 1.2.x branch to trunk.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/TemplateTag.java
    wiki/trunk/jamwiki-war/src/main/webapp/CHANGELOG.txt

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

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

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