Merge branch 'maint-1.9' into maint

* maint-1.9: annotate: use argv_array

Junio C Hamano committed Jul 16, 2014 at 11:11 UTC 9092a9696bee9a5729b7b1741a5de99aecb75552

No changes.