Merge branch 'licensing-nogpl'

Conflicts:
	configure.ac

1 files changed, 3 insertions, 7 deletions

diff --git a/dtls.h b/dtls.h
index 3426e63..27183db 100644
--- a/dtls.h
+++ b/dtls.h
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
 
 const struct protodefs *dtlsinit(uint8_t h);