Merge branch 'master' of https://github.com/dopefishh/cc1516
authorpimjager <pim@pimjager.nl>
Thu, 7 Apr 2016 11:26:35 +0000 (13:26 +0200)
committerpimjager <pim@pimjager.nl>
Thu, 7 Apr 2016 11:26:35 +0000 (13:26 +0200)

Trivial merge