ref: d5b850983c432dd7fdfbeac5e459ed822bbeb8b4
parent: f2ee7829d74d721ba5db1657a1b85e38b7f6fc41
parent: e1426b004c0446dff935da2d62d13c696ca24dad
author: Simon Howard <fraggle@soulsphere.org>
date: Mon Apr 13 17:03:03 EDT 2015
Merge branch 'master' of github.com:chocolate-doom/chocolate-doom