Merge branch 'patches/040_pam-password-prompting' into patches/050_ck_patch
authorIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:01:27 +0000 (23:01 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:01:27 +0000 (23:01 +0000)
commit5b4fa07bbcbe0373f8dd32afcecc9277c46a2d9c
tree654695dbb5d729eb2d3704bba1586355bd9382f5
parent4eb909e18239465fe59c4861466d26e3cd42fa24
parent9d7e4ddb754f0477b67d4815fa38a42e9fa43e66
Merge branch 'patches/040_pam-password-prompting' into patches/050_ck_patch