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)
commit6bcb4dfd35beaabf4c194b32c18f69d6ae98ddde
tree56776914aec8f8a9f2753ce260ff99b8032ee57e
parent4e87d018194f2f3e578153b1a890da2cf62a78e5
parent2ac630bef1ad6e5777cb858d9b81bea01b29f1c9
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy

Conflicts:
web/conf/apache2.0/irspy.conf
web/conf/apache2.0/irspy.conf