Merge branch 'http-fetch-capa' of git://github.com/wgrant/dulwich
authorJelmer Vernooij <jelmer@samba.org>
Thu, 15 Aug 2013 17:30:15 +0000 (17:30 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 15 Aug 2013 17:30:15 +0000 (17:30 +0000)
commitbf350f9b71a8c376b526d989d4d89bcc139507a4
treecb73f56d1a83edbfaeb3b52d13ff0f99d7717c40
parent6c37e0d85376272d82304d6373e5bfb9a667f0a1
parentaea6fbec530368bfac8ebeeed90943e2a425442d
Merge branch 'http-fetch-capa' of git://github.com/wgrant/dulwich

Conflicts:
NEWS
NEWS
dulwich/client.py