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

Trivial merge