merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 1 Jul 2014 13:23:23 +0000 (13:23 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 1 Jul 2014 13:23:23 +0000 (13:23 +0000)
commita939f80e27d187c280a1750311c60f70e7e2220d
treeb56c3478600834ce036b87a27d141f9d7fa748b3
parentfd149fd4c7e0b15d6fe5bcd40ffbf33aea35eb3d
parentafdc25a6021b63e2a8b4cf002b4652b51f977f51
merge-update from trunk
.gitattributes
cdmlib-model/pom.xml
cdmlib-services/pom.xml