From: Steinar H. Gunderson <Steinar H. Gunderson sesse@debian.org>
Date: Tue, 7 Feb 2012 01:29:32 +0000 (+0100)
Subject: Merge branch 'mainline-0.1' of /srv/git.sesse.net/private/ccbs into mainline-0.1
X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=241361bef7fd76ee49b72dec71cf1e35727f599d

Merge branch 'mainline-0.1' of /srv/git.sesse.net/private/ccbs into mainline-0.1
---

241361bef7fd76ee49b72dec71cf1e35727f599d