merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 29 Aug 2013 13:42:11 +0000 (13:42 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 29 Aug 2013 13:42:11 +0000 (13:42 +0000)
commitb04ed1c348548b60ece8c5b597fbf2b770a3f964
tree3adbac45695b4ebf0b54eae03de7b52e16c04ac6
parent6ea34d89f85d36edf358ba68ea4ca894a8661233
parenta064fd4a097611fb8d0e86ba3fd588eeeac10c8e
merge-update from trunk
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
pom.xml