Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 21 May 2015 13:16:55 +0000 (15:16 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 21 May 2015 13:16:55 +0000 (15:16 +0200)

Trivial merge