Merge pull request #242 from freifunk-leipzig/master