From: Michael Casadevall <sonicmctails@gmail.com>
Date: Tue, 30 Dec 2008 21:13:05 +0000 (-0500)
Subject: Merge branch 'master' into dm_upload_allowed
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85e6c424f8c5d1a6f7778b683696322cc2256fc1;p=dak

Merge branch 'master' into dm_upload_allowed

Conflicts:

	ChangeLog
---

85e6c424f8c5d1a6f7778b683696322cc2256fc1