From: Milan Broz Date: Fri, 7 Dec 2012 14:57:00 +0000 (+0100) Subject: Merge branch 'master' of https://code.google.com/p/cryptsetup X-Git-Tag: upstream/1.6~120 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fcryptsetup.git;a=commitdiff_plain;h=5f05949425ed747c0e0c29ccbbe0f35df0a5537a Merge branch 'master' of https://code.google.com/p/cryptsetup --- 5f05949425ed747c0e0c29ccbbe0f35df0a5537a