From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 27 May 2012 17:48:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/cryptsetup-luks'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3caa6f19bad0837eb71727a82863c55eef89693;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/cryptsetup-luks'
---

f3caa6f19bad0837eb71727a82863c55eef89693