From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 12 Dec 2010 19:36:09 +0000 (+0100)
Subject: Merge branch 'master' into security
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=sidebyside;h=4c2f147c52208ab618d5646968e9c3cb45a996d1;hp=4c2f147c52208ab618d5646968e9c3cb45a996d1;p=dak.git

Merge branch 'master' into security

* master:
  new lock dir
  embargo/disembargo build up a symlink farm for our buildds.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---