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, 26 Aug 2015 10:30:07 +0000 (12:30 +0200)
committerU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Wed, 26 Aug 2015 10:30:07 +0000 (12:30 +0200)
commit48f674499660b930ee7bb5d7b3a7e4249d96fa0b
tree4595d6fb125a82001d0dcad94d160937fdf71b47
parente82bceda15ffb75dae7f1fd7444fdbdbc2cabfe1
parent026790369f6b4d7149e6b8c28cad1e643c7a31c9
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch