commit f802aa44fd82cfeb56aa0926f90b5212316ac88e
Merge: f0999abc 76071402
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Wed Jun 1 14:34:18 2016 -0400
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Wed Jun 1 14:34:18 2016 -0400

    Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

 NEWS              |  2 +-
 src/doom/p_mobj.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)