Merge branch 'master' into sudoman-mods
authorAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 21 Dec 2015 16:51:10 +0000 (11:51 -0500)
committerAndrew Engelbrecht <sudoman@ninthfloor.org>
Mon, 21 Dec 2015 16:51:10 +0000 (11:51 -0500)
commit3223fbb24fc255149ede4feb2a0bb3e55eae727d
tree90e4d2e14235483330cc1d272a2ea38e8420a5dd
parentc3890b8b38521f694783033bf08b262efbb27c35
parentd53f19fbf59dd5ee3f8692375d21948e02e04d55
Merge branch 'master' into sudoman-mods
class/50-host-classes