diff options
author | Rob Austein <sra@hactrn.net> | 2010-10-07 00:59:39 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2010-10-07 00:59:39 +0000 |
commit | 94bad6e5ca0045bb46093a3002e7c03ea6e0bee4 (patch) | |
tree | b54b80610b8565a232167290010172cac6b0df2b /rpkid/rpki/adns.py | |
parent | 8ada594d05c4e79fc2e3a13b50489bb75bd90cae (diff) |
Merge rpkid.without_tls/ branch to rpkid/ trunk.
svn path=/rpkid/Makefile; revision=3465
Diffstat (limited to 'rpkid/rpki/adns.py')
-rw-r--r-- | rpkid/rpki/adns.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rpkid/rpki/adns.py b/rpkid/rpki/adns.py index e634a30d..f627ac7a 100644 --- a/rpkid/rpki/adns.py +++ b/rpkid/rpki/adns.py @@ -18,7 +18,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -Portions copyright (C) 2003-2007, 2009, 2010 Nominum, Inc. +Portions copyright (C) 2003--2007, 2009, 2010 Nominum, Inc. Permission to use, copy, modify, and distribute this software and its documentation for any purpose with or without fee is hereby granted, |