Merge.
Merge branch 'master' of https://github.com/hmatuschek/libsdr
Merge branch 'master' of https://github.com/hmatuschek/libsdr