javanna 34de79370f Merge branch 'master' into feature/query-refactoring
Conflicts:
	core/src/main/java/org/elasticsearch/ElasticsearchException.java
2015-09-25 09:38:24 +02:00
..
2015-08-31 17:03:45 +02:00
2015-09-21 14:32:22 -04:00
2015-09-23 09:24:23 -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