tree 74dc3f81095bbb158224f64f612a5c0cc6d25421
parent 2997ebbcfcc2cb4ce02006b1294e90a1a7b3d106
author Jan Høydahl <janhoy@apache.org> 1392964326 +0000
committer Jan Høydahl <janhoy@apache.org> 1392964326 +0000

Merged from trunk

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