Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 6 Jan 2016 16:03:19 +0000 (17:03 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 6 Jan 2016 16:03:19 +0000 (17:03 +0100)
commit05a5c0f87b3270e408a66fbaad3008de145a11c8
treede6d43902bc380f25349f078b20c5ef0ab255410
parentcb73af0a18cfde23c2c551ef50d56d59134e6e04
parentd0c15b1eac81c17cc70ad2c1e04fea84fb150867
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop