ref: 5ddb558a635208d9c08210be8283c83a8d45278f
parent: 95a7160ca80c21057ecfe72fdba4a2dd977223e3
parent: fa3dc6f58921ec8299b1ec49913b75fda1659e74
author: Simon Howard <fraggle@gmail.com>
date: Sat Apr 11 22:22:06 EDT 2015
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom