Merge branch 'master' of https://github.com/dopefishh/cc1516
authorpimjager <pim@pimjager.nl>
Mon, 29 Feb 2016 12:00:47 +0000 (13:00 +0100)
committerpimjager <pim@pimjager.nl>
Mon, 29 Feb 2016 12:00:47 +0000 (13:00 +0100)

Trivial merge