]> err.no Git - dak/commitdiff
Merge branch 'master' into bpo
authorJoerg Jaspert <joerg@debian.org>
Sun, 5 Sep 2010 14:13:50 +0000 (16:13 +0200)
committerJoerg Jaspert <joerg@debian.org>
Sun, 5 Sep 2010 14:13:50 +0000 (16:13 +0200)
* master:
  We are on franck


Trivial merge