From: Dean Camera <dean@fourwalledcubicle.com>
Date: Tue, 13 Aug 2013 19:04:40 +0000 (+0200)
Subject: Merge branch 'xmega-twi' of github.com:jamuraa/lufa into xmega-twi-integration
X-Git-Tag: LUFA-130901-BETA~12
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/5fde9e0f0d029bc8e54f997705074b0442159849?hp=-c

Merge branch 'xmega-twi' of github.com:jamuraa/lufa into xmega-twi-integration
---

5fde9e0f0d029bc8e54f997705074b0442159849