merge trunk (1237250:1237842)

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