From: Robert Kaiser <kairo@kairo.at>
Date: Sat, 3 Jan 2015 12:54:43 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/git-kairo
X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=commitdiff_plain;h=4eb45bd45fc0af3f677ad8a7e3f10cf25bdc2929;hp=55fef093d1027a06f8047e45148d71b48bb6b7d2

Merge branch 'master' of linz:/srv/git/git-kairo
---

diff --git a/testbed/rrd/.gitignore b/testbed/rrd/.gitignore
index 6a72854..0009048 100644
--- a/testbed/rrd/.gitignore
+++ b/testbed/rrd/.gitignore
@@ -1,4 +1,5 @@
 *.rrd
+weather.te838.json
 graphs
 rrd-backup
 weather.wien.zamg.rrd.xml