- A logic fix related to Main 2 spell prediction.
- Some card memory code refactoring.

git-svn-id: http://svn.slightlymagic.net/forge/trunk@27379 269b9781-a132-4a9b-9d4e-f004f1b56b58
Remove potentially problematic svn:mergeinfo properties.

git-svn-id: http://svn.slightlymagic.net/forge/trunk@27381 269b9781-a132-4a9b-9d4e-f004f1b56b58