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

author Patrick Plitzner <p.plitzner@bgbm.org>

Mon, 16 Nov 2015 15:51:20 +0000 (16:51 +0100)

committer Patrick Plitzner <p.plitzner@bgbm.org>

Mon, 16 Nov 2015 15:51:20 +0000 (16:51 +0100)
author Patrick Plitzner <p.plitzner@bgbm.org>
Mon, 16 Nov 2015 15:51:20 +0000 (16:51 +0100)
committer Patrick Plitzner <p.plitzner@bgbm.org>
Mon, 16 Nov 2015 15:51:20 +0000 (16:51 +0100)
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
Simple merge
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
Simple merge
author	Patrick Plitzner <p.plitzner@bgbm.org>
	Mon, 16 Nov 2015 15:51:20 +0000 (16:51 +0100)
committer	Patrick Plitzner <p.plitzner@bgbm.org>
	Mon, 16 Nov 2015 15:51:20 +0000 (16:51 +0100)
		1	2
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java	patch \|	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java	patch \|	diff1 \|	diff2 \|	blob \| history