f72c2efa91e03ece366a5f8c8ac719b254c1dac5 is the first bad commit
commit f72c2efa91e03ece366a5f8c8ac719b254c1dac5
Author: Chris Beck <[email protected]>
Date:   Thu May 22 11:51:49 2014 -0400

    fixup error logging, catch parsing exceptions in editor, -p option

    Conflicts:
        src/savegame.cpp

:040000 040000 3bafbf695e41e4b03469faa435f052fcdba7999d d049e2921791e84b04fab5270aa678027ccb303a M      src