Colin Goodheart-Smithe cd8320b171 Merge branch 'master' into feature/aggs-refactoring
# Conflicts:
#	core/src/main/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregator.java
#	core/src/main/java/org/elasticsearch/search/aggregations/bucket/filters/FiltersAggregator.java
#	core/src/main/java/org/elasticsearch/search/SearchModule.java
2016-01-25 10:42:20 +00:00
..
2016-01-20 03:32:51 -05:00
2016-01-20 03:32:51 -05:00
2016-01-16 22:45:37 -08:00
2015-04-27 17:19:36 +02:00
2015-08-01 05:14:46 -04:00
2015-12-10 12:01:18 +01:00
2015-10-09 12:27:43 +02:00