javanna f8a90edab2 Merge branch 'master' into feature/query-refactoring
Conflicts:
	core/src/main/java/org/elasticsearch/index/query/TermsLookupQueryBuilder.java
	core/src/main/java/org/elasticsearch/index/query/TermsQueryBuilder.java
2015-08-14 11:40:49 +02:00
..
2015-08-07 18:25:55 -04:00
2015-07-29 16:11:18 -04:00
2015-04-27 17:19:36 +02:00
2015-08-01 05:14:46 -04:00
2015-06-29 10:15:27 +02:00