javanna f2605b34d6 Merge branch 'master' into feature/query-refactoring
Conflicts:
	core/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
2015-09-08 16:11:22 +02:00
..
2015-08-07 18:25:55 -04:00
2015-08-31 17:03:45 +02:00
2015-08-15 16:20:06 +02:00
2015-08-22 01:37:43 -07: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