Merge commit 'ncomm/dm_upload_allowed' into merge

* commit 'ncomm/dm_upload_allowed':
  Removed excess -D option from byhand-dm
Signed-off-by: NJoerg Jaspert <joerg@debian.org>

scripts/debian/byhand-dm

@@ -41,7 +41,7 @@ echo "Authorised upload by $ID, copying into place"
 OUT=$(mktemp)
 
 cp "$BYHAND" "$DESTKR"
-dak import-keyring -D --generate-users "%s" "$DESTKR" >$OUT
+dak import-keyring --generate-users "%s" "$DESTKR" >$OUT
 
 if [ -s "$OUT" ]; then
   /usr/sbin/sendmail -odq -oi -t <<EOF