merge trunk (1130066:1139453)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr2193@1139458 13f79535-47bb-0310-9956-ffa450edef68
tree: d15e25fd1202271158d8758e721565fb1df00ee6
  1. dev-tools/
  2. lucene/
  3. modules/
  4. solr/
  5. .gitignore
  6. .hgignore
  7. build.xml
  8. README.txt