Merge branch 'master' into next
commita2f2990c2255a5322c1f784c726a1424dd5ee2ce
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2012 22:00:37 +0000 (29 15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2012 22:00:37 +0000 (29 15:00 -0700)
tree54f7d3ce61e2013edf5ab760c4ee0956f41fa7b7
parent6fa690c347c9b4ca223008d0196c0ef47cdb9f27
parent16d26b168b371b2f4f86b1adb61470c6b08b27b9
Merge branch 'master' into next

* master:
  Latter half of the second batch for 1.8.0