Merge branch 'master' of https://github.com/dopefishh/cc1516
authorpimjager <pim@pimjager.nl>
Mon, 29 Feb 2016 19:25:58 +0000 (20:25 +0100)
committerpimjager <pim@pimjager.nl>
Mon, 29 Feb 2016 19:25:58 +0000 (20:25 +0100)

Trivial merge