From 18f84cb71febbffd7734ad552f8996479933ecfd Mon Sep 17 00:00:00 2001
From: Daniel Bohrer <Daniel Bohrer@stratum0.org/mediawiki/>
Date: Mon, 7 Mar 2016 01:14:21 +0000
Subject: [PATCH] =?utf8?q?/*=20Externes=20*/=20GPN16,=20mal=20wieder=20vs.?=
 =?utf8?q?=20Maker=20Faire=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Termine.mw | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Termine.mw b/Termine.mw
index 512b159ec..03b141d49 100644
--- a/Termine.mw
+++ b/Termine.mw
@@ -284,6 +284,8 @@ Verstrichene Termine werden automatisch nach etwa 3 Monaten ins [[Termine/Archiv
 | ''[https://events.ccc.de/congress/2015/wiki/Main_Page 32C3] in Hamburg (Assemblies: [https://events.ccc.de/congress/2015/wiki/Assembly:Singularity_City Singularity City], [https://events.ccc.de/congress/2015/wiki/Assembly:Stratum_0 Stratum 0])'' || 27.12.2015 - 30.12.2015 ||
 |-
 | ''[http://makerfairehannover.com/ Maker Faire Hannover 2016]'' || 27.05.2016 - 29.05.2016 ||
+|-
+| ''[http://gulas.ch GPN16]'' || 26.05.2016 -29.05.2016 ||
 |}
 
 == Leuchtkram-Treffen ==
-- 
2.20.1