Merge branch 'master' of github.com:dopefishh/cc1516
authorMart Lubbers <mart@martlubbers.net>
Mon, 14 Mar 2016 22:33:53 +0000 (23:33 +0100)
committerMart Lubbers <mart@martlubbers.net>
Mon, 14 Mar 2016 22:33:53 +0000 (23:33 +0100)

Trivial merge