Merge branch 'master' of github.com:dopefishh/cc1516
authorMart Lubbers <mart@martlubbers.net>
Fri, 20 May 2016 11:26:30 +0000 (13:26 +0200)
committerMart Lubbers <mart@martlubbers.net>
Fri, 20 May 2016 11:26:30 +0000 (13:26 +0200)

Trivial merge