[Pkg-cli-apps-commits] [SCM] keepass2 branch, dfsg_clean, updated. upstream/2.17+dfsg-2-g254b2cc

[Julian Taylor]

The following commit has been merged in the dfsg_clean branch:
commit 254b2ccdf569569f48b8400a57f647041f97d9d1
Merge: 496959975e676f7b52980cb5be8dbf56e57354c4 c10829ceae406fcc6ac846409ce1fc1f42efee51
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Thu Jan 5 23:29:14 2012 +0100

    Merge commit 'upstream/2.18' into dfsg_clean
    
    Conflicts:
    	Build/KeePassLibSD_Distrib/KeePassLibSD.dll
    	Build/KeePassLib_Distrib/KeePassLib.dll


-- 
keepass2