tree c9637b83dc7a1f513493342efbd001297af37ab1
parent 2db5d70abae6ef0a98a44bc3f55986960778dcfc
parent 25afdaf65b81fec19daa255c0a8bbe94466a9598
author Robert Muir <rmuir@apache.org> 1350147242 +0000
committer Robert Muir <rmuir@apache.org> 1350147242 +0000

merge trunk

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