updated to snapshot version
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 4 Jun 2015 13:55:14 +0000 (15:55 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 4 Jun 2015 13:55:14 +0000 (15:55 +0200)
commit5f02ad3ea8a8bea5f2f8c9153d0cdf90f8aabbc5
tree92d8874dc445071891f8a9fcdd450c6ae3ac27de
parentafd232b8a927cfecf45a9b0e33d95d924db56700
parent02176688eaa23a31ff5b71c317cb5ee685483aa4
updated to snapshot version

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF