[master] Merge branch 'master' of ssh://repo/proj/git/prod/bind9

This commit is contained in:
Evan Hunt 2016-01-04 16:09:40 -08:00
commit aadca3f7d0
4 changed files with 4 additions and 4 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (C) 2006-2009, 2012-2015 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2006-2009, 2012-2016 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

View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2015 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any

View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2008-2015 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 2008-2016 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

View file

@ -4,7 +4,7 @@
<!ENTITY mdash "&#8212;">
<!ENTITY ouml "&#xf6;">]>
<!--
- Copyright (C) 2014, 2015 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2014-2016 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