Merge branch 'reenc' of https://code.google.com/p/cryptsetup into reenc
authorMilan Broz <gmazyland@gmail.com>
Tue, 12 Jun 2012 11:26:09 +0000 (13:26 +0200)
committerMilan Broz <gmazyland@gmail.com>
Tue, 12 Jun 2012 11:26:09 +0000 (13:26 +0200)
commit05b695d5165f280bcdffbac9a312a3fee1202436
treec96667e0a6d55108701a989a386f1ca025785afe
parent44c9b2fc68a0dfc888e94c137fcb3d8c3b5720c7
parent624157ef7b226c627be37cdb2713d8c24cf6152a
Merge branch 'reenc' of https://code.google.com/p/cryptsetup into reenc

Conflicts:
src/Makefile.am