ref: 5c644aea77f8e37f2f39928b2256c9a13cdebb99
parent: 4d9752561a4575f90a48c75e7d7bfa783c72deff
parent: 26524bf56324364ceb1f9fad6e1efec55315d73d
author: linguica <github@andrewstine.org>
date: Sun Sep 6 08:51:31 EDT 2015
Merge remote-tracking branch 'chocolate-doom/master'