Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 23 Jun 2015 13:06:40 +0000 (15:06 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 23 Jun 2015 13:06:40 +0000 (15:06 +0200)
commit9632d60d4c0c495662372d4befb1fa40361848a4
tree972834309fd52d194f9ed03926de7435965c1d77
parent530ba36728a03ec737fe2147af267a5bb31f78ae
parentc555b2093dc0512b422e664eb1ebc467a29256e6
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java