Merge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 4 Jun 2015 13:30:07 +0000 (15:30 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 4 Jun 2015 13:30:07 +0000 (15:30 +0200)
commitafd232b8a927cfecf45a9b0e33d95d924db56700
tree05b9afa51142ed98ae05179196f99f8f2dee1dd2
parentebd5e5e57594cbdce268285ef6b9880a3ce9d33b
parenta41fa7f76c2fba3574f8f955cb3fece78f45ca4c
Merge branch 'move-to-luna' 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