Merge pull request #2533 from freifunk-berlin/freifunk-repo