LUCENE-3156: forrest regen and correct merge bug

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_3_2@1129401 13f79535-47bb-0310-9956-ffa450edef68
33 files changed
tree: 96de4d365ef024f3c9aa20e09bc574320dc87a2e
  1. dev-tools/
  2. lucene/
  3. solr/
  4. .hgignore
  5. build.xml
  6. common-build.xml
  7. README.txt