Merge branch 'cb/maint-no-double-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jun 2009 04:15:27 +0000 (21:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jun 2009 04:15:27 +0000 (21:15 -0700)
commitd836118...e990867be3a4d3ce932f58d761e5e612
tree5d8d0f0...e79fec24bf034d1660c81f70e4423512copy hash to clipboard (tree)
parent6019b3c...8d178ed99d37b32cc2c523c25f0d58a1copy hash to clipboard (diff)
parentc8c562a...38071843c64ea0f3a2c85481606da379copy hash to clipboard (diff)