betasteward 5c746e8ec2 Merge branch 'master' of https://github.com/magefree/mage ... Conflicts: Mage.Sets/src/mage/sets/avacynrestored/CavernOfSouls.java Mage.Sets/src/mage/sets/shadowmoor/ManaReflection.java		2015-03-01 22:02:33 -05:00
..
frozen/org/mage/test/clientside	* Redesigned idle timeout handling to prevent selecting wrong player for timeout.	2014-12-27 17:31:52 +01:00
test	Merge branch 'master' of https://github.com/magefree/mage	2015-03-01 22:02:33 -05:00