From: Michael Casadevall <sonicmctails@gmail.com>
Date: Fri, 2 Jan 2009 21:58:37 +0000 (-0500)
Subject: Merge commit 'origin/master' into dm_upload_allowed
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=203e76d0f6eddac1ad270d68df5e96357d0d0011;p=dak

Merge commit 'origin/master' into dm_upload_allowed

Conflicts:

	ChangeLog.old

Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>
---

203e76d0f6eddac1ad270d68df5e96357d0d0011