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

Trivial merge