Merge branch 'xmega-twi' of github.com:jamuraa/lufa into xmega-twi-integration
authorDean Camera <dean@fourwalledcubicle.com>
Tue, 13 Aug 2013 19:04:40 +0000 (21:04 +0200)
committerDean Camera <dean@fourwalledcubicle.com>
Tue, 13 Aug 2013 19:04:40 +0000 (21:04 +0200)

Trivial merge