Merge branch 'jk/maint-merge-msg-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2009 19:05:57 +0000 (12:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Aug 2009 19:05:57 +0000 (12:05 -0700)
commitbd30037...65c53112dd84c2712750e152b2f7f854
tree3f3f970...cddc32d13a25d76fe6eb86a11ee67c93copy hash to clipboard (tree)
parent6b37b3d...73e734919dfd43c3d124c4f98e265296copy hash to clipboard (diff)
parent69a8b7c...4192dfa7bde3937d2c84324a2cd1506bcopy hash to clipboard (diff)