From: Andrew Engelbrecht <sudoman@ninthfloor.org>
Date: Mon, 21 Dec 2015 16:51:10 +0000 (-0500)
Subject: Merge branch 'master' into sudoman-mods
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3223fbb24fc255149ede4feb2a0bb3e55eae727d;p=fai-configs.git

Merge branch 'master' into sudoman-mods
---

3223fbb24fc255149ede4feb2a0bb3e55eae727d