Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 25 Jun 2015 08:31:15 +0000 (10:31 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 25 Jun 2015 08:31:15 +0000 (10:31 +0200)

Trivial merge