tree 4890fc176f6022ac66850f704ad804ddb6f0acac
parent 411297f5b60e9c14488b36196894652aa13745ca
parent c98f93568897d76d0c2dc158ac9824cc1ca4f8af
author Robert Muir <rmuir@apache.org> 1349223032 +0000
committer Robert Muir <rmuir@apache.org> 1349223032 +0000

merge up to trunk

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