Merge branch 'master' of https://code.google.com/p/cryptsetup
authorArno Wagner <wagner.arno@gmail.com>
Tue, 24 Apr 2012 08:11:34 +0000 (10:11 +0200)
committerArno Wagner <wagner.arno@gmail.com>
Tue, 24 Apr 2012 08:11:34 +0000 (10:11 +0200)
commite48a808b5cb7d81b54b05757b80dcfd308c825c3
tree5d0c959017ae720ddf1db6d21231ab69419a3b33
parentf929abacab93c6e92c809052e6f182ac7712479f
parent15628793699066a19bcd6d30e6d4a5150c1c43cf
Merge branch 'master' of https://code.google.com/p/cryptsetup