Upgrade to symfony2.4
Merge branch 'master' of https://github.com/sopinet/composergeneric

Conflicts:
	composer.json