Merge branch 'master' of https://github.com/dopefishh/cc1516
authorpimjager <pim@pimjager.nl>
Thu, 14 Apr 2016 10:51:57 +0000 (12:51 +0200)
committerpimjager <pim@pimjager.nl>
Thu, 14 Apr 2016 10:51:57 +0000 (12:51 +0200)

Trivial merge