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

Trivial merge