Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 21:34:18 +0000 (13:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 21:34:18 +0000 (13:34 -0800)
* maint:
am: don't persist keepcr flag
mingw: give waitpid the correct signature
git symbolic-ref: documentation fix

Trivial merge