Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 14 Nov 2014 12:53:22 +0000 (13:53 +0100)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 14 Nov 2014 12:53:22 +0000 (13:53 +0100)
commitaf62cf5634a1dd753f7031399a2a20549a140ecf
tree47d54bfde88efa97e1581007f6210ef0262222e9
parent840818e037f260581b45e5e4a90742d59a34ca87
parent89c045edbd3d09872a06cfe5e1eafbc17b6f4958
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy

Conflicts:
zebra/zebra.cfg
zebra/zebra.cfg