From: Christian Spilker <christian@klausibabs.de>
Date: Thu, 24 Oct 2013 20:11:39 +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/0e08764c8201f13bd03e685bfc7a2e5ee65dc540

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

0e08764c8201f13bd03e685bfc7a2e5ee65dc540