Merge branch 'nd/strbuf-utf8-replace'
commit1764e8124e441a84b4764da0f8e6b0c900c44941
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:02 +0000 (9 12:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:02 +0000 (9 12:54 -0700)
tree392cc5ba3df866f718a08c5aa3e0e5e639dd62af
parent27fbcf8267ecc484cafdbfe84a3aaf2f373f3e2a
parent430875969a5229c1d306e4cc5acc8c8afe2b50a3
Merge branch 'nd/strbuf-utf8-replace'

* nd/strbuf-utf8-replace:
  utf8.c: fix strbuf_utf8_replace() consuming data beyond input string
t/t4205-log-pretty-formats.sh
utf8.c