Merge branch 'jk/complete-merge-pull' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:46:12 +0000 (11:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:46:12 +0000 (11:46 -0700)
commitff7e96b...8f3ad9db61fbdfdeaf7b71f254f76310
tree5931ff7...3db1eefc6345a4ab54247095f595f2f7copy hash to clipboard (tree)
parentfbfdf13...5c0f168bbb292454d8099ca49dd7dbd6copy hash to clipboard (diff)
parent8fee872...470bd63db6c396ea6208ea487eaa8fabcopy hash to clipboard (diff)