Merge branch 'master' into dev/argeo-slc-2.1
authorMathieu Baudier <mbaudier@argeo.org>
Sun, 22 May 2016 07:47:16 +0000 (09:47 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Sun, 22 May 2016 07:47:16 +0000 (09:47 +0200)
commit89f1ec9f7bf43836641f6c229e9c3addc1770b58
tree97e3007d4efdd9be78604fb4e863c32a8a98d0ff
parent41c10bb31b2d80c2ea14b039e834f594d26942b1
parentd232fd6f4860d1148a12ac4433dd06b4a691d059
Merge branch 'master' into dev/argeo-slc-2.1
META-INF/MANIFEST.MF
META-INF/spring/distribution.xml
META-INF/spring/osgi.xml
pom.xml