]> git.ipfire.org Git - thirdparty/dnspython.git/commitdiff
Merge branch 'master' into python3
authorBob Halley <halley@nominum.com>
Mon, 25 Jan 2010 23:59:41 +0000 (15:59 -0800)
committerBob Halley <halley@nominum.com>
Mon, 25 Jan 2010 23:59:41 +0000 (15:59 -0800)

Trivial merge