From 5a10cf6fa6fff3cbca3340a7c75120603bda18ca Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Wed, 29 Oct 2014 15:06:39 +0100
Subject: Copyright NORDUnet.

---
 tools/merge.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/merge.py b/tools/merge.py
index 7120d04..41144ea 100755
--- a/tools/merge.py
+++ b/tools/merge.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (c) 2014 Kungliga Tekniska Högskolan
-# (KTH Royal Institute of Technology, Stockholm, Sweden).
+#
+# Copyright (c) 2014, NORDUnet A/S.
 # See LICENSE for licensing information.
 
 import json
-- 
cgit v1.1