From: Christian Spilker <christian@klausibabs.de>
Date: Wed, 23 Oct 2013 20:35:37 +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/5c42c95f4d84a47a1e9d24cd61413d10a50f2007

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

5c42c95f4d84a47a1e9d24cd61413d10a50f2007