Merge branch 'master' into next
commit6b7e1602084580fec66696af8e06d2316b425c65
authorJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:14:36 +0000 (4 08:14 -0500)
committerJeff King <peff@peff.net>
Sun, 4 Nov 2012 13:14:36 +0000 (4 08:14 -0500)
tree0827d4d0ad7a5e230d7d6f40e09b5646ac050fba
parent62af90c6ff5fe91113e2f69a60caae6ef7d54614
parentf07e5551a845b45076bf5c45118e16efa69610c4
Merge branch 'master' into next