Merge branch 'master' of https://code.google.com/p/cryptsetup
authorArno Wagner <wagner.arno@gmail.com>
Tue, 22 May 2012 21:58:44 +0000 (23:58 +0200)
committerArno Wagner <wagner.arno@gmail.com>
Tue, 22 May 2012 21:58:44 +0000 (23:58 +0200)
commit9910c7dcd0956e7608f53fcf7c7b81793f581556
tree76c54385331f8711a074eb8fac96c33b0784622e
parent9ff422374d1b0d05c7404b83da877d005ddef1e4
parent716e60729d067d5149691c5bd6d76cc314e61bc6
Merge branch 'master' of https://code.google.com/p/cryptsetup