Christoph Büscher b763265f67 Merge branch 'master' into feature/query-refactoring
Conflicts:
	core/src/main/java/org/elasticsearch/transport/local/LocalTransport.java
2015-08-06 11:14:04 +02:00
..
2015-07-31 19:11:04 -04:00
2015-07-29 16:11:18 -04:00
2015-08-01 05:14:46 -04:00
2015-08-05 06:45:52 -04:00
2015-08-01 05:14:46 -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