Merge branch 'master' of github.com:dopefishh/cc1516
authorMart Lubbers <mart@martlubbers.net>
Wed, 13 Apr 2016 17:46:23 +0000 (19:46 +0200)
committerMart Lubbers <mart@martlubbers.net>
Wed, 13 Apr 2016 17:46:23 +0000 (19:46 +0200)

Trivial merge