]> git.decadent.org.uk Git - dak.git/commitdiff
Merge remote branch 'ansgar/p-s-from-db' into merge
authorMark Hymers <mhy@debian.org>
Fri, 8 Apr 2011 20:31:52 +0000 (21:31 +0100)
committerMark Hymers <mhy@debian.org>
Fri, 8 Apr 2011 20:31:52 +0000 (21:31 +0100)
Signed-off-by: Mark Hymers <mhy@debian.org>

Trivial merge