]> git.ipfire.org Git - thirdparty/dnspython.git/commitdiff
Merge branch 'master' into python3 v1.8.0-py3
authorBob Halley <halley@nominum.com>
Tue, 26 Jan 2010 00:36:03 +0000 (16:36 -0800)
committerBob Halley <halley@nominum.com>
Tue, 26 Jan 2010 00:36:03 +0000 (16:36 -0800)

Trivial merge