Merge branch 'fix_mix_str_and_non-str_arguments' of https://github.com/dzhuang/dulwich
authorJelmer Vernooij <jelmer@jelmer.uk>
Sat, 29 Apr 2017 23:43:55 +0000 (23:43 +0000)
committerJelmer Vernooij <jelmer@jelmer.uk>
Sat, 29 Apr 2017 23:43:55 +0000 (23:43 +0000)

Trivial merge