Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Tue, 24 Nov 2015 13:20:28 +0000 (14:20 +0100)
committerKatja Luther <k.luther@bgbm.org>
Tue, 24 Nov 2015 13:20:28 +0000 (14:20 +0100)
commit5bb64b9f8db3dadc19c1c3f69696c2b03322e6d7
tree603c9ccc141dce5259aee5a2b85928c52488d9ab
parentf512d3f152a1d436606c16f1cfcf10bda9103016
parent6b462070805a746386f53dff1c3f68c0d7795aef
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop