Merge branch 'master' into next
commit7185a7e9c0f380b366991f3563e613dcf68b776f
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Feb 2015 19:29:29 +0000 (17 11:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Feb 2015 19:29:29 +0000 (17 11:29 -0800)
tree315e9736dcda558c0925ea7c534c58132cee9b29
parentd7867a3fef861fd9ac2607c4fecea00cdb032fc9
parent3188ab3af60df6ace996d3985e8f1ca1ed3cbda5
Merge branch 'master' into next

* master:
  Post 2.3 cycle (batch #2)