Merge branch 'sudoman-mods'
authorAndrew Engelbrecht <sudoman@ninthfloor.org>
Fri, 14 Aug 2015 15:40:46 +0000 (11:40 -0400)
committerAndrew Engelbrecht <sudoman@ninthfloor.org>
Fri, 14 Aug 2015 15:40:46 +0000 (11:40 -0400)

Trivial merge