From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 28 Feb 2016 18:28:17 +0000 (+0100)
Subject: Merge branch 'master' of /srv/git.sesse.net/www/greproxy
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c60112039fe8e523aebf17f23d4ee07e9a056fbe;hp=7019fcdc8632b5740798e8345b48e23640e2de1b;p=greproxy

Merge branch 'master' of /srv/git.sesse.net/www/greproxy
---

diff --git a/README b/README
index 70651e3..2717985 100644
--- a/README
+++ b/README
@@ -26,5 +26,5 @@ Primary features:
 greproxy is licensed under the GNU General Public License, version 2.
 See the file COPYING.
 
-Copyright: Steinar H. Gunderson <sgunderson@bigfoot.com>
+Copyright: Steinar H. Gunderson <steinar+greproxy@gunderson.no>