Merge branch 'master' of
authorBruno Sinou <bsinou@argeo.org>
Thu, 5 Jun 2014 08:49:47 +0000 (10:49 +0200)
committerBruno Sinou <bsinou@argeo.org>
Thu, 5 Jun 2014 08:49:47 +0000 (10:49 +0200)
commit2282fcf7da3e05e455f81b83d85207cfd42952ad
treedc697f106ff825bb0da73f524a660345833c2ef5
parent599838298beef142a5c1addfc13735e85d6397bc
parent4e5ce28f625c47d17403c2a584fa5cd8121b5dda
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
META-INF/spring/distribution.xml