commit 90f7206384d54cee5cee40f3e7c64b7a7c43cb26
Merge: 3aefe2f2 71936d18
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Apr 26 21:17:53 2014 -0400
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Sat Apr 26 21:17:53 2014 -0400

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

 man/Makefile.am  | 2 +-
 src/i_sdlmusic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)