Merge branch 'master' into next
commit4eafbef75a48d09805549838ac12745708c3f928
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 17:44:37 +0000 (11 10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 17:44:37 +0000 (11 10:44 -0700)
tree278a37f8e929a0b077e3e443407e4e8233445062
parent278edb1ef4d602ddd1b3144cf01442adc197f9ae
parenta5fe66802f8c4036badd54ff36ff327d43236e7e
Merge branch 'master' into next

* master:
  Second half of seventh batch