Merge remote branch 'origin/master'
authorAvery Pennarun <apenwarr@gmail.com>
Thu, 24 Jun 2010 06:11:04 +0000 (02:11 -0400)
committerAvery Pennarun <apenwarr@gmail.com>
Thu, 24 Jun 2010 06:11:04 +0000 (02:11 -0400)
commit8e770bd389f1810a4b1a53da51e0761ca1435f3a
tree94ab1c47218efd452a4736341cde635ad2f96597
parent9c632ea29ccd58a9967690c2670edec31dc468cd
parent39f5fff0d53bcc68f5c698150d2d3b35eececc27
Merge remote branch 'origin/master'

* origin/master:
  Fixed regression with splitting out new subtree
  Use 'git merge -Xsubtree' when git version >= 1.7.0.
git-subtree.sh