Adopt changes done on live system
Merge branch 'ffm' of github.com:freifunk-ffm/ff-serv into ffm