From: Linus Nordberg <linus@nordu.net>
Date: Fri, 14 Sep 2012 08:32:53 +0000 (+0200)
Subject: Merge branch 'licensing-nogpl'
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=libradsec.git;a=commitdiff_plain;h=8c8a1423c3d407bd119b75aae93386bbfd0176e2

Merge branch 'licensing-nogpl'

Conflicts:
	configure.ac
---

8c8a1423c3d407bd119b75aae93386bbfd0176e2
diff --cc configure.ac
index 9ba93f5,4326ecc..e5df020
--- a/configure.ac
+++ b/configure.ac
@@@ -1,4 -1,8 +1,8 @@@
+ dnl Copyright (c) 2006-2010, UNINETT AS
+ dnl Copyright (c) 2010-2012, NORDUnet A/S
+ dnl See LICENSE for licensing information.
+ 
 -AC_INIT(radsecproxy, 1.6.1-dev, radsecproxy@uninett.no)
 +AC_INIT(radsecproxy, 1.7-dev, radsecproxy@uninett.no)
  AC_CANONICAL_TARGET
  AM_INIT_AUTOMAKE
  AC_PROG_CC