]> err.no Git - dak/commit
Merge commit 'dak-master/master' into dm_upload_allowed
authorMichael Casadevall <sonicmctails@gmail.com>
Tue, 30 Dec 2008 05:23:09 +0000 (00:23 -0500)
committerMichael Casadevall <sonicmctails@gmail.com>
Tue, 30 Dec 2008 05:23:09 +0000 (00:23 -0500)
commit279743ce44cd6c487ad57bcd3d15306402893763
treefceec8fce8c8e82130aa1ce0f8a9ed787281c9c8
parenta10398019d83fb13fbe230c944ed51470a35df34
parentf10b5359465d28011b1b467b83f42aa14011cd86
Merge commit 'dak-master/master' into dm_upload_allowed

Conflicts:

ChangeLog

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