From: Joerg Jaspert Date: Wed, 23 Mar 2011 21:25:42 +0000 (+0100) Subject: Merge branch 'merge' X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=fea9a58aece85c71c5bd91622a19c026bb715cbc;hp=fea9a58aece85c71c5bd91622a19c026bb715cbc;p=dak.git Merge branch 'merge' * merge: Fix dak update-db ---