From: Steinar H. Gunderson <Steinar H. Gunderson sesse@debian.org>
Date: Thu, 9 Feb 2012 22:22:52 +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=b96dfdd47d90850d85715651e765e14f0f65d560

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

b96dfdd47d90850d85715651e765e14f0f65d560