Merge branch 'master' into next
commit1f6e3927efabdc53ad8d02d572a312d6112cbb5c
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Feb 2013 21:55:29 +0000 (26 13:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Feb 2013 21:55:29 +0000 (26 13:55 -0800)
treec84fc5cab5556f67a78ad7fcc97e4b31e62e69a7
parentc07952521f77a9c6f45f25025feb0e6275855d14
parent27db5a02c73b35fe6b004fca66a824e022cc3c01
Merge branch 'master' into next

* master:
  Revert "compat: add strtok_r()"
  wincred: improve compatibility with windows versions
  wincred: accept CRLF on stdin to simplify console usage
contrib/credential/wincred/git-credential-wincred.c