[Pkg-cli-apps-commits] [SCM] keepass2 branch, dfsg_clean, updated. upstream/2.21+dfsg-3-gcdb112d

[Julian Taylor]

The following commit has been merged in the dfsg_clean branch:
commit 9b5423986ab9c8917b372130559feea88daa416c
Merge: 2632ded1c2336c0573e31cbdc8ac933b9f99e666 3f235d632909ce3b156e51270f693181d087a6e7
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Sun Apr 14 14:34:37 2013 +0200

    Merge tag 'upstream/2.22' into dfsg_clean
    
    Upstream version 2.22
    
    Conflicts:
    	Build/KeePassLibSD_Distrib/KeePassLibSD.dll
    	Build/KeePassLib_Distrib/KeePassLib.dll


-- 
keepass2