From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 5 Sep 2010 14:13:50 +0000 (+0200)
Subject: Merge branch 'master' into bpo
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=fa35358d461b03ff5833385ca2970cecce454d0e;p=dak.git

Merge branch 'master' into bpo

* master:
  We are on franck
---

fa35358d461b03ff5833385ca2970cecce454d0e