Merge branch 'master' of chaos.expert:ccc-ffm/4Refugees-InternetCafe
authorWonko T. Sane <42@wonko.de>
Mon, 8 Feb 2016 18:30:30 +0000 (19:30 +0100)
committerWonko T. Sane <42@wonko.de>
Mon, 8 Feb 2016 18:30:30 +0000 (19:30 +0100)

Trivial merge