Jeremy Mikola 5f83fd90c2 Merge pull request #51 from willdurand/propel-support ... Propel support Conflicts: DependencyInjection/FOQElasticaExtension.php		2012-01-12 16:01:33 +00:00
..
Compiler	Synchronize with upstream	2011-04-20 14:28:12 -07:00
Configuration.php	Merge pull request #51 from willdurand/propel-support	2012-01-12 16:01:33 +00:00
FOQElasticaExtension.php	Merge pull request #51 from willdurand/propel-support	2012-01-12 16:01:33 +00:00