ffs-xmas15
Merge branch 'master' of https://github.com/freifunk-stuttgart/peers-ffs