From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 14 Nov 2014 12:53:22 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy
X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=commitdiff_plain;h=af62cf5634a1dd753f7031399a2a20549a140ecf;ds=sidebyside

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy

Conflicts:
	zebra/zebra.cfg
---

af62cf5634a1dd753f7031399a2a20549a140ecf