Merge branch 'master' of https://code.google.com/p/cryptsetup
authorDebian User <wagner@tansi.org>
Tue, 21 Feb 2012 14:55:23 +0000 (15:55 +0100)
committerDebian User <wagner@tansi.org>
Tue, 21 Feb 2012 14:55:23 +0000 (15:55 +0100)
commit54bf872663c280964539511eb1bed8191ad1adbb
treedfa70f327c67d2553376ce08c40a27d97dda14ee
parent4b109507d8eae91f6d3c025f1deb28b8946ee0c8
parent625822e5a10b6c25f2906e2c86181fa02f1e049f
Merge branch 'master' of https://code.google.com/p/cryptsetup