tree 876221969584bf6ec9e2f7bb59b71cc532e9df1c
parent feae187d786e8ee5107c7de865f1e9570dc0e7e6
parent 2964bd0a6444b00eef9e7061f3f6c93f4396cded
author Rickard Öberg <rickardoberg@gmail.com> 1289224303 +0100
committer Rickard Öberg <rickardoberg@gmail.com> 1289224303 +0100

Merge branch 'master' of git@github.com:Qi4j/qi4j-sandbox

Conflicts:
	extensions/osgi/bootstrap/pom.xml
	extensions/osgi/example/pom.xml
	extensions/osgi/integrationTests/pom.xml
	extensions/osgi/testBootstrap/pom.xml
	extensions/pom.xml
	libraries/entityproxy/pom.xml
	libraries/pom.xml