From: Bert Vermeulen <redacted>
Date: Thu, 15 Mar 2012 23:04:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'joel/public'
X-Git-Tag: libsigrok-0.1.0~41
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=21b50ee1831602bd6c1f223fb200e2c298885aa3;p=libsigrok.git

Merge remote-tracking branch 'joel/public'
---

21b50ee1831602bd6c1f223fb200e2c298885aa3