From: Avery Pennarun <apenwarr@gmail.com>
Date: Thu, 24 Jun 2010 06:11:04 +0000 (-0400)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: v1.7.11-rc0~176^2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e770bd389f1810a4b1a53da51e0761ca1435f3a;p=git.git

Merge remote branch 'origin/master'

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

8e770bd389f1810a4b1a53da51e0761ca1435f3a