Ray 41b347dfe4 Merge remote-tracking branch 'upstream/master' ... Conflicts: Logger/ElasticaLogger.php README.md		2014-03-18 19:59:27 -04:30
..
Compiler	Fix definition decorators (closes #393)	2013-11-01 09:15:38 +11:00
Configuration.php	Merge remote-tracking branch 'upstream/master'	2014-03-18 19:59:27 -04:30
FOSElasticaExtension.php	Merge pull request #463 from FriendsOfSymfony/add-hotswapping-aliased-indexes-on-populate	2014-03-17 09:20:12 +11:00