Tim Nagel befb0907cc Merge branch 'master' into documentation ... Conflicts: DependencyInjection/Configuration.php README.md		2014-03-25 16:04:32 +11:00
..
Compiler	Fix definition decorators (closes #393)	2013-11-01 09:15:38 +11:00
Configuration.php	Merge branch 'master' into documentation	2014-03-25 16:04:32 +11:00
FOSElasticaExtension.php	Merge branch 'master' into documentation	2014-03-25 16:04:32 +11:00