Christoph Büscher 59cb67c7bd Merge branch 'master' into feature/query-refactoring
Conflicts:
	core/src/main/java/org/elasticsearch/index/query/support/NestedInnerQueryParseSupport.java
2015-08-25 11:59:40 +02:00
..
2015-08-07 18:25:55 -04:00
2015-08-15 16:20:06 +02: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