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)
commit7509c9f33939429d74ef835f26791e57020bbc9a
tree58811a98c58ab8cbc7981a97fa894e114128d643
parent5eaf7c899477a46fdca7ee667a3b82b058221904
parentc56aa276e4a9d5a92da17b154944c9667401af7e
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor