From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 16 Nov 2013 01:17:53 +0000 (-0800)
Subject: Merge branch 'master' of http://ftp-master.debian.org/git/dak
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=24d49284f74357d52b22b1ba4457a7f3624dd57f;p=dak.git

Merge branch 'master' of http://ftp-master.debian.org/git/dak

Conflicts:
	daklib/queue.py
---

24d49284f74357d52b22b1ba4457a7f3624dd57f