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

This commit is contained in:
Evan Hunt 2016-01-04 16:10:05 -08:00
commit 0dd38adbe7
2 changed files with 2 additions and 2 deletions

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

@ -2,7 +2,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