Merge branch 'master' of github.com:dopefishh/cc1516
authorMart Lubbers <mart@martlubbers.net>
Thu, 12 May 2016 14:32:59 +0000 (16:32 +0200)
committerMart Lubbers <mart@martlubbers.net>
Thu, 12 May 2016 14:32:59 +0000 (16:32 +0200)

Trivial merge