Merge branch 'master' of https://code.google.com/p/cryptsetup
authorMilan Broz <gmazyland@gmail.com>
Fri, 7 Dec 2012 14:57:00 +0000 (15:57 +0100)
committerMilan Broz <gmazyland@gmail.com>
Fri, 7 Dec 2012 14:57:00 +0000 (15:57 +0100)
commit5f05949425ed747c0e0c29ccbbe0f35df0a5537a
treef56c432ae160e950f46b13edfec85837f365cc5c
parent5dc654433c3816fd726f29c73a0fcdc0484148b8
parent2eab3e640206e223742f9cf193a4d42dd33700ed
Merge branch 'master' of https://code.google.com/p/cryptsetup