Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Wed, 24 Jun 2015 07:40:31 +0000 (09:40 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Wed, 24 Jun 2015 07:40:31 +0000 (09:40 +0200)
commit19a8bfe7b1bc7f737a85baeb4255edb32c79e7fa
tree05d7ffd1fd06bce483279983d5fe6d253fa176d3
parent3237a3607431bd338d470b18d4e45229abdb8bff
parent6992befa12d1768187f9d2f31eabfe4bce2fc156
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/AbstractLazyInitializerTest.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/RemoteLazyLoadingTest.java
pom.xml