merge trunk (1202685:1202825)

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