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, 2 Sep 2015 09:34:32 +0000 (11:34 +0200)
committerU-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Wed, 2 Sep 2015 09:34:32 +0000 (11:34 +0200)
commit812f4a8d68326f427c8b8f39d061c4cef875bb58
tree9b8600f54d5b87ca531eca9af1f15bd765791caa
parent95ee1b51f476e72636aa96a830f85b9e41861c59
parent0e24f82352da64018c70aa4fbe27df93e620a218
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch