merge from trunk
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 9 Dec 2014 17:21:54 +0000 (17:21 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 9 Dec 2014 17:21:54 +0000 (17:21 +0000)
commit25864e07108dc7194697f1dde9b1f22d01205a14
tree5eec4e85ee181bba401562d8cd5dfb837fb659db
parentd59e5382ea29417d778b89146ac0fef4056c7df2
parent2e4de8d191e63d21823d36499c3841eedefb7bc5
merge from trunk
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF