Christoph Büscher 421ed1228b Merge branch 'master' into feature-suggest-refactoring ... Conflicts: core/src/main/java/org/elasticsearch/search/suggest/phrase/PhraseSuggestionBuilder.java		2016-02-10 11:37:51 +01:00
..
src/main	Merge branch 'master' into feature-suggest-refactoring	2016-02-10 11:37:51 +01:00
build.gradle	Also use separte buildSrc build dir for intellij	2016-02-04 15:58:05 -08:00
version.properties	Upgrade to lucene 5.5.0-snapshot-1725675	2016-02-02 22:53:39 -05:00