Merge branch 'master' of https://github.com/fudger/pigpio.
authorAlexander Schaefer <alexander.c.schaefer@gmail.com>
Sat, 12 Mar 2016 20:50:46 +0000 (21:50 +0100)
committerAlexander Schaefer <alexander.c.schaefer@gmail.com>
Sat, 12 Mar 2016 20:50:46 +0000 (21:50 +0100)

Trivial merge