Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
authorU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Wed, 30 Sep 2015 11:01:00 +0000 (13:01 +0200)
committerU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Wed, 30 Sep 2015 11:01:00 +0000 (13:01 +0200)
commit79b22d9c0017f21b9d8c2ed7584b28cecf160d83
tree354c6a40619f4adb13738734df91954d81b72017
parent4537c26d0f76d2e6e74695bc8ed66ad51d24bd59
parentb2e3cca70a7fb9998b8169875a10f7ef7f7f62bf
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch