Merge commit 'dak-master/master' into dm_upload_allowed

Conflicts:

	ChangeLog

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

diff --cc ChangeLog
index bb145f4b79e73337a682bc668d5a2a6b4423eab9,d550ecdacfcf1b7f3d525407ff703920820d4635..1f5e33c3dbfbe0fe0fadb7bab8d1c5d88c87068a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -22,27 -4,8 +22,29 @@@
  
  2008-12-26  Michael Casadevall <sonicmctails@gmail.com>
  
 -       * dak/queue_report.py - Added Last Modified in asctime() for QA team
 +        * dak/import_keyring.py - Debrainized the projectb schema w.r.t. to DMs
 +                                  Now uses Debian-Maintainer column in uid table
 +
 +        * dak/import_ldap_fingerprints.py - Ditto
 +
 +        * dak/process_unchecked.py - Same
 +
 +        * scripts/debian/byhand-dm - See Above
 +
 +        * setup/init_pool.sql - More of the same
 +
 +        * dak/process_unchecked.py - Implemented new dm_upload_allowed field in source
 +
 +        * dak/process_unchecked.py - Fixed bug where dm-upload-allowed would not be respected
 +          in cases where only experimental had the DM-Upload-Allowed: yes flag.
 +
 +        * dak/process_accepted.py - Ditto, also causes new uploads to include uploaders
 +          table to properly include all uploads
 +
 +        * setup/init_pool.sql - Updated schema
 +
++        * dak/queue_report.py - Added Last Modified in asctime() for QA team
+ 
  2008-12-23  Michael Casadevall <sonicmctails@gmail.com>
  
          * dak/queue_report.py - Added 822 output format