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

[Julian Taylor]

The following commit has been merged in the dfsg_clean branch:
commit 496959975e676f7b52980cb5be8dbf56e57354c4
Merge: e8ba98ca27e774c6e5e107bdc2f75f1eca7e5a7a 2329c0628c75b69f6061b75f44caa6b485bd50cd
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Wed Oct 19 21:47:47 2011 +0200

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


-- 
keepass2