collector: added urlopen timeuot, fixes #45
Merge branch 'master' of github.com:freifunk/api.freifunk.net
Update directory.json

Mainzer Freifunk mit aufgenommen.
Merge pull request #49 from whallmann/patch-1

Update directory.json (add Mainz)
removed css:background-position-y
added css:background-position
removed tabs -> added spaces
Merge pull request #3 from freifunk-ffm/templating

removed css:background-position-y
Merge pull request #48 from mojoaxel/templating

Use templating to render the community-popup html
Merge branch 'master' of github.com:freifunk/api.freifunk.net
ffmap: minor fix, missing location icon
Update mergedrss.php

bitte "via" bei Source rausnehmen. Thx
Merge pull request #52 from christianheise/patch-1

Update mergedrss.php
Merge branch 'master' into gh-pages
fffeed: don't use empty items in merged feed
Merge branch 'master' into gh-pages