git.samba.org
/
abartlet
/
samba-debian.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'upstream/4.0.5+dfsg1' into samba_4.0_ivo
[abartlet/samba-debian.git]
/
lib
/
dnspython
/
dns
/
rdtypes
/
ANY
/
TXT.py
diff --git
a/lib/dnspython/dns/rdtypes/ANY/TXT.py
b/lib/dnspython/dns/rdtypes/ANY/TXT.py
index 23f4f3b7c66f511a570cb9ad85df431c57a98edc..604fd0f4deb8b83fa86235692d0211231245ca72 100644
(file)
--- a/
lib/dnspython/dns/rdtypes/ANY/TXT.py
+++ b/
lib/dnspython/dns/rdtypes/ANY/TXT.py
@@
-1,4
+1,4
@@
-# Copyright (C) 2003-2007, 2009
, 2010
Nominum, Inc.
+# Copyright (C) 2003-2007, 2009
-2011
Nominum, Inc.
#
# Permission to use, copy, modify, and distribute this software and its
# documentation for any purpose with or without fee is hereby granted,