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)
commit1d9266c48e6673c2824369f2a95d1d844d5bfd5a
tree9cb0afcb3e3e660aef2ad4286226fe98887ed8e7
parentb9ea7de04ede60239f84c8f7f4d8f97c0dc212bc
parent1ac6f567879d8e93d7c0d3510fc1766e244de871
Merge branch 'sudoman-mods'