From: Christian Spilker <christian@klausibabs.de>
Date: Thu, 24 Oct 2013 16:53:47 +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/99cbdc069ab64c279514861af45bfa1a8c036db9

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

99cbdc069ab64c279514861af45bfa1a8c036db9