tree 83b6d26df0c4db4ef5a1fa5a214d794011dc73cc
parent 9e19c170943c9d088148871f2e23c07d8ea777b8
parent 4db5c1f5bb0eb6b5ac9c5a02bec8a8bab6bb0fb3
author Uwe Schindler <uschindler@apache.org> 1346584861 +0000
committer Uwe Schindler <uschindler@apache.org> 1346584861 +0000

LUCENE-3312: Final merge before reintegrate

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