javanna 99147228d7 Merge branch 'master' into feature/query-refactoring
Conflicts:
	core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java
	core/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java
2015-06-23 10:16:21 +02:00
..
2015-06-19 17:29:11 +02:00
2015-06-09 09:25:23 +02:00
2015-04-27 17:19:36 +02:00
2014-09-11 09:52:09 +02:00