tree 3768f95a9f60d8d874fe5299cce20deb6bccc052
parent 681c61be5004d2725dd3c4bfa704039e0c25793d
parent 67b7b43b4936a97201d5bd850da79226473bbe9c
author Robert Muir <rmuir@apache.org> 1400252660 +0000
committer Robert Muir <rmuir@apache.org> 1400252660 +0000

LUCENE-5666: merge trunk

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene5666@1595228 13f79535-47bb-0310-9956-ffa450edef68