Daenyth/Cockatrice — pull request #238 by arxanas (2014-07-28 00:57:54+00:00)
Title: Fix #231: tokens.xml no longer overwritten by cards.xml.

Apparently the fix was exactly as simple as I thought it wasn't. @Psithief does this fix the issue?