Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 14 Nov 2014 12:11:40 +0000 (12:11 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 14 Nov 2014 12:11:40 +0000 (12:11 +0000)
Conflicts:
web/conf/apache2.0/irspy.conf


No differences found