Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Jul 2014 18:54:29 +0000 (11:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Jul 2014 18:54:29 +0000 (11:54 -0700)
commit1239da9a9c5008afd6d0ee04721dd7785372258c
treee5dcb8e1b9117eb6a41e614d89ce7fd372667ef0
parentdcaf3c8833b3cc96e64723c6872f4cc51cb25140
parent81e776d92bb19a4fab12dcc537adfd543468d7d0
Merge branch 'master' into next

* master:
  Sixth batch for 2.1