Merge branch 'master' of ssh://sigrok.org/data/git/sigrok-cli
authorBert Vermeulen <bert@biot.com>
Sun, 14 Oct 2012 12:59:11 +0000 (14:59 +0200)
committerBert Vermeulen <bert@biot.com>
Sun, 14 Oct 2012 12:59:11 +0000 (14:59 +0200)

Trivial merge