Merge branch 'reenc' of https://code.google.com/p/cryptsetup into reenc
authorMilan Broz <gmazyland@gmail.com>
Tue, 12 Jun 2012 16:05:00 +0000 (18:05 +0200)
committerMilan Broz <gmazyland@gmail.com>
Tue, 12 Jun 2012 16:05:00 +0000 (18:05 +0200)
commit0d70651c5a17c6856287838bf81159fa91800865
treefa6408f168a5a3b2fac3f399a646b253e0f875f6
parentb1fb2532e0fdfcbd276b6661e662df56cba92287
parent05b695d5165f280bcdffbac9a312a3fee1202436
Merge branch 'reenc' of https://code.google.com/p/cryptsetup into reenc