Richard Miller 6eff104d6d Merge branch '2.0' ... Conflicts: DependencyInjection/FOQElasticaExtension.php Manager/RepositoryManager.php README.md Resources/config/config.xml Resources/config/propel.xml		2012-01-12 16:34:19 +00:00
..
Compiler	Merge pull request #58 from merk/index_transformer	2012-01-12 16:10:28 +00:00
Configuration.php	Merge pull request #62 from merk/patch-1	2012-01-12 16:11:44 +00:00
FOQElasticaExtension.php	Merge branch '2.0'	2012-01-12 16:34:19 +00:00