somaen/scummvm — pull request #13 by tobiatesan (2013-09-21 21:54:31+00:00)
Title: This should be sans the ugly merge commits 

But, you might need to update your master