Christoph Büscher fab3b5568f Merge branch 'master' into feature-suggest-refactoring
Conflicts:
	core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionContext.java
2016-02-09 11:35:13 +01:00
..
2016-02-04 13:03:03 -08:00