Merge branch 'maint-1.7.11' into maint
commit3503e9ab32c7a478d0d985171c50a901a2695162
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Sep 2012 21:08:05 +0000 (12 14:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Sep 2012 21:08:05 +0000 (12 14:08 -0700)
tree3fdddd11cc1cfe64e0d69c0ebcc92eac8dc77ced
parentcbd6b089e821a4ff35970531b26e64a2e621ff04
parent1403db49b80630cf8c36ba3e8b0f085ea0ab8286
Merge branch 'maint-1.7.11' into maint
builtin/apply.c
builtin/rev-parse.c
http.c
revision.c
t/lib-httpd.sh
t/lib-httpd/apache.conf