]> git.decadent.org.uk Git - dak.git/commitdiff
Merge branch 'merge'
authorJoerg Jaspert <joerg@debian.org>
Sat, 9 Jan 2010 22:43:38 +0000 (23:43 +0100)
committerJoerg Jaspert <joerg@debian.org>
Sat, 9 Jan 2010 22:43:38 +0000 (23:43 +0100)
* merge:
  fixes from some previous bad merge


Trivial merge