Merge branch 'develop' into feature/cdm-4.7
authorAndreas Müller <a.mueller@bgbm.org>
Sat, 20 May 2017 21:28:19 +0000 (23:28 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Sat, 20 May 2017 21:28:19 +0000 (23:28 +0200)
1  2 
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ITaxonNameBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java
cdmlib-services/pom.xml
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/CommonServiceImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java

Simple merge