Merge branch 'jc/maint-merge-autoedit' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Apr 2012 19:56:35 +0000 (12:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Apr 2012 19:56:35 +0000 (12:56 -0700)
commitb52ab19...91015ebd6bebc83a82b2c3d64b948b36
tree56c03a1...3b6d6e5597f3e73ece62879c6268da45copy hash to clipboard (tree)
parentb8939b2...3abaa99c18bf57251cd2828b89ac38c5copy hash to clipboard (diff)
parentd387868...7d29621e85e8c5c061d1f50586db74e5copy hash to clipboard (diff)