Merge branch 'master' of github.com:dopefishh/cc1516
authorMart Lubbers <mart@martlubbers.net>
Thu, 26 May 2016 19:44:38 +0000 (21:44 +0200)
committerMart Lubbers <mart@martlubbers.net>
Thu, 26 May 2016 19:44:38 +0000 (21:44 +0200)

Trivial merge