Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
authorKatja Luther <k.luther@bgbm.org>
Wed, 9 Mar 2016 11:07:29 +0000 (12:07 +0100)
committerKatja Luther <k.luther@bgbm.org>
Wed, 9 Mar 2016 11:07:29 +0000 (12:07 +0100)
commit5d280a500f4605a83c2624d556c41070b199365c
treeb984bb5f9506eaab74e94863750863ac2ea3aed8
parentfe2e78f05b0af711a8ecbb43de46100152d98140
parent20801c1900ad7084f429d60bb414280f3b2c6a77
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop