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

Trivial merge