Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Wed, 26 Aug 2015 09:03:14 +0000 (11:03 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Wed, 26 Aug 2015 09:03:14 +0000 (11:03 +0200)
commit317a1bcbde0e0ff9aefb3e53e85ee1b9db65a0b3
treef6c7c8760fedfe26febc3c86bf10e53f7076664d
parent3a8e076a4b5f9a1f5985836ea4ff0819a693f6f2
parent0bb254eee1359f0a18ffefd168cba579584c3768
Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java