Gregwar 39e2f390f0 Merge commit 'be90f19'
Conflicts:
	DependencyInjection/Configuration.php
	Generator/CaptchaGenerator.php
	composer.json
2013-04-22 00:35:49 +02:00
..
2011-08-25 23:10:24 +02:00
2013-04-22 00:35:49 +02:00
2012-12-03 19:02:43 -05:00