From: Ian Beckwith <ianb@erislabs.net>
Date: Sat, 28 Jan 2012 23:01:27 +0000 (+0000)
Subject: Merge branch 'patches/040_pam-password-prompting' into patches/050_ck_patch
X-Git-Url: http://erislabs.net/gitweb/?p=ckermit.git;a=commitdiff_plain;h=5b4fa07bbcbe0373f8dd32afcecc9277c46a2d9c

Merge branch 'patches/040_pam-password-prompting' into patches/050_ck_patch
---

5b4fa07bbcbe0373f8dd32afcecc9277c46a2d9c