Merge branch 'master' of ssh://git.kea.isc.org/git/kea

doc/guide/kea-guide.xml

@@ -7,7 +7,7 @@
 ]>
 
 <!--
- - Copyright (C) 2010-2014  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2010-2015  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
@@ -29,7 +29,7 @@
     <title>Kea Administrator Reference Manual</title>
 
     <copyright>
-      <year>2010-2014</year><holder>Internet Systems Consortium, Inc.</holder>
+      <year>2010-2015</year><holder>Internet Systems Consortium, Inc.</holder>
     </copyright>
 
     <abstract>