err.no Git - dak/commit

]> err.no Git - dak/commit

author	Michael Casadevall <sonicmctails@gmail.com>
	Tue, 30 Dec 2008 05:23:09 +0000 (00:23 -0500)
committer	Michael Casadevall <sonicmctails@gmail.com>
	Tue, 30 Dec 2008 05:23:09 +0000 (00:23 -0500)
commit	279743ce44cd6c487ad57bcd3d15306402893763
tree	fceec8fce8c8e82130aa1ce0f8a9ed787281c9c8	tree \| snapshot
parent	a10398019d83fb13fbe230c944ed51470a35df34	commit \| diff
parent	f10b5359465d28011b1b467b83f42aa14011cd86	commit \| diff

Merge commit 'dak-master/master' into dm_upload_allowed

Conflicts:

ChangeLog

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

Unnamed repository; edit this file 'description' to name the repository.