Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Mon, 16 Nov 2015 11:37:33 +0000 (12:37 +0100)
committerKatja Luther <k.luther@bgbm.org>
Mon, 16 Nov 2015 11:37:33 +0000 (12:37 +0100)
commit24b8816f96500b3c1f5763727a6b96883bfe474f
tree9a06be168ce43c0de43bca303abf2663a78bdf8d
parentc1c463d760a7c0ea8a99f8ba243ce45913cb3c82
parent8f0650661e4167e053fdebd91427a31f9fd870a0
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop