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

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

Revision: 3846
          http://jamwiki.svn.sourceforge.net/jamwiki/?rev=3846&view=rev
Author:   wrh2
Date:     2011-11-28 03:57:28 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Merge:
  * Merge changes from the 1.1.x branch to trunk.

Modified Paths:
--------------
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageMetadata.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/image/ImageUtil.java
    wiki/trunk/jamwiki-core/src/main/java/org/jamwiki/parser/jflex/ImageLinkTag.java
    wiki/trunk/jamwiki-core/src/test/resources/data/results/ImageLink1
    wiki/trunk/jamwiki-core/src/test/resources/data/topics/ImageLink1
    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.