From: Daniel Ribeiro <redacted>
Date: Mon, 10 Jan 2011 04:28:59 +0000 (-0200)
Subject: Merge branch 'master' of git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok
X-Git-Tag: libsigrok-0.1.0~460
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e006af1116adb76014e77db718bb8673137a8bf5;p=libsigrok.git

Merge branch 'master' of git://sigrok.git.sourceforge.net/gitroot/sigrok/sigrok
---

e006af1116adb76014e77db718bb8673137a8bf5