From: Ansgar Burchardt <ansgar@debian.org>
Date: Thu, 24 Mar 2011 19:33:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into version-checks
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=8d96479bcfd210f9cf8f5692b2982d3c3a08ba5c

Merge remote-tracking branch 'origin/master' into version-checks

Conflicts:
	dak/update_db.py
---

8d96479bcfd210f9cf8f5692b2982d3c3a08ba5c