Merge branch 'maint-1.9' into maint
commit9092a9696bee9a5729b7b1741a5de99aecb75552
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:11:06 +0000 (16 11:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:11:06 +0000 (16 11:11 -0700)
tree269e60cab1739e619e1dd0bae3a4f859ae04d168
parent8693e1cc2f0778954eb8aef5af9d98ac7b0c7dbb
parentd22acacf810a92d5634099a7db0367ce5b6fdcef
Merge branch 'maint-1.9' into maint

* maint-1.9:
  annotate: use argv_array