tree 58fde7a22bcb2610639fd570faf645a716efd281
parent a4e2350675b7bd8c7ad5eff65982d9e1146649a5
parent 1529c57ca19385b35a153357785aed9d47eb5150
author Michael McCandless <mikemccand@apache.org> 1423439594 +0000
committer Michael McCandless <mikemccand@apache.org> 1423439594 +0000

LUCENE-6005: merge trunk

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