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)
1  2 
class/50-host-classes

Simple merge