]> git.sesse.net Git - ccbs/commitdiff
Merge branch 'mainline-0.1' of /srv/git.sesse.net/private/ccbs into mainline-0.1
authorSteinar H. Gunderson <Steinar H. Gunderson sesse@debian.org>
Thu, 9 Feb 2012 22:22:52 +0000 (23:22 +0100)
committerSteinar H. Gunderson <Steinar H. Gunderson sesse@debian.org>
Thu, 9 Feb 2012 22:22:52 +0000 (23:22 +0100)

Trivial merge