Fix merge remoting-4.0 root/branches/taxeditor/remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Wed, 16 Sep 2015 19:24:25 +0000 (21:24 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Wed, 16 Sep 2015 19:24:25 +0000 (21:24 +0200)
commitfbedcb2325afa80c8e778152e0553c3767fb14a1
tree05b2a57bfa06b28d71a8efee7692b3f62ca33853
parenta52450e2f2051b6bd6577b6f91d10351c41d5237
Fix merge
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties