Andrew's git / gitweb.git / diff
?
Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Sep 2015 21:34:57 +0000 (14:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Sep 2015 21:34:57 +0000 (14:34 -0700)
* maint:

Trivial merge