Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index db69cf2d0e7f9cb8ca584cdf1b04f8273ca7bf3e..c5160ff159e4a04bc84f103ff9c9c2f0c24e332d 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright 1998-2007 The OpenLDAP Foundation
+Copyright 1998-2014 The OpenLDAP Foundation

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without


@@ -25,7 +25,7 @@ Additional information about OpenLDAP can be obtained at
 
 ---
 
 
 ---
 

-Portions Copyright 1998-2006 Kurt D. Zeilenga.
+Portions Copyright 1998-2012 Kurt D. Zeilenga.

 Portions Copyright 1998-2006 Net Boolean Incorporated.
 Portions Copyright 2001-2006 IBM Corporation.
 All rights reserved.
 Portions Copyright 1998-2006 Net Boolean Incorporated.
 Portions Copyright 2001-2006 IBM Corporation.
 All rights reserved.


@@ -36,9 +36,11 @@ Public License.
 
 ---
 
 
 ---
 

-Portions Copyright 1999-2005 Howard Y.H. Chu.
-Portions Copyright 1999-2005 Symas Corporation.
+Portions Copyright 1999-2008 Howard Y.H. Chu.
+Portions Copyright 1999-2008 Symas Corporation.

 Portions Copyright 1998-2003 Hallvard B. Furuseth.
 Portions Copyright 1998-2003 Hallvard B. Furuseth.

+Portions Copyright 2007-2011 Gavin Henry.
+Portions Copyright 2007-2011 Suretec Systems Ltd.

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without