From: Bruno Sinou <bsinou@argeo.org>
Date: Thu, 5 Jun 2014 08:49:47 +0000 (+0200)
Subject: Merge branch 'master' of
X-Git-Tag: v2.3.9~150
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=2282fcf7da3e05e455f81b83d85207cfd42952ad;p=gpl%2Fargeo-tp.git

Merge branch 'master' of
ssh://bsinou@git.argeo.org:322/var/lib/git/git.argeo.org/org.argeo.tp.slc.factory.git/

Conflicts:
	META-INF/MANIFEST.MF
	pom.xml
---

2282fcf7da3e05e455f81b83d85207cfd42952ad
diff --cc META-INF/spring/distribution.xml
index 23bc071,496d881..1c2b8cb
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@@ -99,4 -111,4 +114,4 @@@
  		<property name="osgiFactory" ref="osgiFactory" />
  	</bean>
  
--</beans>
++</beans>