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)

Trivial merge