Merge branch 'master' of https://github.com/dopefishh/cc1516
authorpimjager <pim@pimjager.nl>
Wed, 13 Apr 2016 17:27:03 +0000 (19:27 +0200)
committerpimjager <pim@pimjager.nl>
Wed, 13 Apr 2016 17:27:03 +0000 (19:27 +0200)

Trivial merge