Sync with master
commite727dec93ab54c06c072aed01968580556da9191
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:42:41 +0000 (20 13:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:42:41 +0000 (20 13:42 -0700)
treed17b47a50b885828d4da78fa3ac73c7ba283caf6
parentc47322bd8438f6a0c0143b37cc74fd13539e18b2
parent786a89d3477c339676ed36d5d2d7507251344952
Sync with master

* master:
  Fourth batch for 2.1