From: Wintermate <wintermute@hannover.ccc.de>
Date: Thu, 24 Oct 2013 20:22:06 +0000 (+0200)
Subject: Merge branch 'master' of gitlab:wintermute/hackover2013-badge-firmware
X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/commitdiff_plain/0b162010a8ae6d401564797c5122394857965ab9

Merge branch 'master' of gitlab:wintermute/hackover2013-badge-firmware
---

0b162010a8ae6d401564797c5122394857965ab9