Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 19 Jan 2013 13:18:33 +0000 (14:18 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 19 Jan 2013 13:18:33 +0000 (14:18 +0100)

Trivial merge