Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch
authorU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Thu, 27 Aug 2015 11:04:41 +0000 (13:04 +0200)
committerU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Thu, 27 Aug 2015 11:04:41 +0000 (13:04 +0200)
commit123de1cca54f14cfd1d6d40c4aca139427347936
tree5036b87444b098ea279e995315d5423df16fdffe
parent01effd906d9c760f530e248ae30871c94ed39ac4
parent4bef54003be2735952433349f5f6f7a702decf09
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch