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

Trivial merge