Thunder12345 a9a97f5a81 Fixes for Merge Tokens (#18168) ...

* fixes #15649
fixes #16575

* oops forgot those lines

2016-06-03 14:46:42 -05:00

..

spell_types

Fixes for Merge Tokens (#18168)

2016-06-03 14:46:42 -05:00

spell.dm

cleanup

2016-05-08 11:46:26 -04:00