Merge branch 'maint'
commitcd04c522bdcecdbea3a3f53d71381bd8f679c580
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 20:52:25 +0000 (25 13:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 20:52:25 +0000 (25 13:52 -0700)
tree7445acf91a8fcfafce8b8aa74e7f07a7d924443f
parent7b592fadf1e23b10b913e0771b9f711770597266
parent1252f8b29faf3a1a45a995ae72d1d8c8ee67ad36
Merge branch 'maint'

* maint:
  Start preparing for 1.8.2.1
  transport.c: help gcc 4.6.3 users by squelching compiler warning
transport.c