sebix/hosts — pull request #2 by charringer (2013-10-03 00:30:15+00:00)
Title: merge sebix's hosts into charringer's hosts

hope I am not doing exactly the opposite...