Tim Nagel f6df88cc67 Merge branch 'master' into pr/744 ... Conflicts: Command/PopulateCommand.php		2015-03-11 14:11:18 +11:00
..
Compiler	Move IndexManager's resolution to tagged index services	2014-06-18 16:49:57 +10:00
Configuration.php	Merge branch '3.0.x'	2015-01-27 08:21:57 +11:00
FOSElasticaExtension.php	Merge branch 'master' into pr/744	2015-03-11 14:11:18 +11:00