Merge branch 'patches/030_fix-if-else' into patches/040_pam-password-prompting
authorIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:00:18 +0000 (23:00 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:00:18 +0000 (23:00 +0000)
commit31c46a4d5ec49f04bd2b861de00ddd498f658d85
tree90b0982ca521cea773a003bb2c0364da2a6b4f20
parentc298fb9a5c2430cfc8fd22800ee25eabf900cf6b
parent12c445f65f6dddfc8f97fb2d8614eb1278f1ed23
Merge branch 'patches/030_fix-if-else' into patches/040_pam-password-prompting