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

Trivial merge