Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Wed, 16 Sep 2015 17:19:25 +0000 (19:19 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Wed, 16 Sep 2015 17:19:25 +0000 (19:19 +0200)
commit999d37c42eeb8050f0269503cfa2aee48cda3d01
tree72849e9276302988c3ce7f5e19b012ea6dcfdf60
parenta63b22b4275b2a7d4dbb6cfcd12b7d4dcd4c6e41
parent64a4022f6419039354f198221bba4455ff1cb4c1
Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
pom.xml