Merge branch 'sudoman-mods'
authorAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 17 Aug 2015 16:47:18 +0000 (12:47 -0400)
committerAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 17 Aug 2015 16:47:18 +0000 (12:47 -0400)
commitcaf9e3ce158e2df1ef27e3c38175ac5386ef0c09
treeb564eec89dd839229a8cbf5f6321c40eedbf04b2
parente0166e679fed5c8f960d99f9384eb53fc19f6be8
parent2d2767dca27be7ec7a704cd4feefb86c84b9607b
Merge branch 'sudoman-mods'