From: Ian Beckwith <ianb@erislabs.net>
Date: Sat, 28 Jan 2012 23:00:18 +0000 (+0000)
Subject: Merge branch 'patches/030_fix-if-else' into patches/040_pam-password-prompting
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=31c46a4d5ec49f04bd2b861de00ddd498f658d85;hp=12c445f65f6dddfc8f97fb2d8614eb1278f1ed23;p=ckermit.git

Merge branch 'patches/030_fix-if-else' into patches/040_pam-password-prompting
---