Merge branch 'master' of git://github.com/chunkeey/carl9170fw
authorChristian Lamparter <chunkeey@googlemail.com>
Sat, 1 Jun 2013 20:24:51 +0000 (22:24 +0200)
committerChristian Lamparter <chunkeey@googlemail.com>
Sat, 1 Jun 2013 20:24:51 +0000 (22:24 +0200)

Trivial merge