[Forensics-changes] [SCM] debian-forensics/guymager branch, master, updated. debian/0.5.9-1-12-gb24145a

[Julien Valroff]

The following commit has been merged in the master branch:
commit b24145a947db43b27c3d64697cccdb9c45cd29a6
Merge: 593b6a0b6ec163b6274de20d4fbefe2753cc5443 a43d74ee8c9f20814198505bda23d653409455b6
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Jan 7 16:18:58 2012 +0100

    Merge commit 'upstream/0.5.9'
    
    Conflicts:
    	CREDITS
    	guymager.desktop


-- 
debian-forensics/guymager