merge trunk (1228939:1230700)

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