Merge branch 'master' of git+ssh://bind10.isc.org/var/bind10/git/bind10

bef9fc00 · Michal 'vorner' Vaner · d622e35a · 433ef14c · bef9fc00 · bef9fc00
Commit bef9fc00 authored Apr 07, 2011 by Michal 'vorner' Vaner
--- a/src/lib/dns/rdata/template.cc
+++ b/src/lib/dns/rdata/template.cc
-// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above

--- a/src/lib/dns/rdata/template.h
+++ b/src/lib/dns/rdata/template.h
-// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above