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

[Julian Taylor]

The following commit has been merged in the dfsg_clean branch:
commit 69919615f541cbeae1a01c96511c55ef520aed51
Merge: 8ddecda85c5eeb9ed2c92d0ed1cf9a9ab8fb2280 092aeff1c5af218d750f3231e3b6a8ee7a785566
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Tue Feb 26 20:12:14 2013 +0100

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


-- 
keepass2