Merge branch 'master' of https://code.google.com/p/cryptsetup
authorArno Wagner <wagner.arno@gmail.com>
Sun, 10 Jun 2012 15:59:00 +0000 (17:59 +0200)
committerArno Wagner <wagner.arno@gmail.com>
Sun, 10 Jun 2012 15:59:00 +0000 (17:59 +0200)
commit47c5b5ed064092caad514610f9988f6231d6cd5c
tree7c4d716db2ec3730104ae980f860c084765b7a8d
parent0eae18109224f30109f795171fe922fd67fac370
parented1b59fd25df8f89b14ac89529c871f5a434e1f2
Merge branch 'master' of https://code.google.com/p/cryptsetup