Sync with master
commitf681aa8b2164b7263bd68f49cd3bebd6bf560b78
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:52:17 +0000 (16 12:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 19:52:17 +0000 (16 12:52 -0700)
tree913d6955eaa99e1429ce0ff41124d6789939770b
parentb2d2d7b0c200724d5e286344a7a712af552aa8a1
parentcb682f8cfe63ecd0da08a526f404d295e51e3ab1
Sync with master

* master:
  Third batch for 2.1