Merge branch 'nd/strbuf-utf8-replace'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:02 +0000 (12:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:02 +0000 (12:54 -0700)
* nd/strbuf-utf8-replace:
utf8.c: fix strbuf_utf8_replace() consuming data beyond input string

1  2 
t/t4205-log-pretty-formats.sh
utf8.c
Simple merge
diff --cc utf8.c
Simple merge