Ivan Lackovic 798f29e635 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	DependencyInjection/Configuration.php

2014-03-19 16:27:04 +01:00

..

Configuration.php

Merge remote-tracking branch 'upstream/master'

2014-03-19 16:27:04 +01:00

GregwarCaptchaExtension.php

Moving the "reload without as_url" exception to catch more cases (see

2013-08-07 10:57:56 +02:00