Merge branch 'master' into next
commit56e79320f3d9b044c380dfebf136584aaa17ac5b
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Dec 2011 18:03:20 +0000 (2 10:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Dec 2011 18:03:20 +0000 (2 10:03 -0800)
treea58d75d50988c6d2b568518db0bc3953b44ad42e
parent9ef225745e2777b46364afc3297e5b06d1e29033
parent406da7803217998ff6bf5dc69c55b1613556c2f4
Merge branch 'master' into next

* master:
  Git 1.7.8