poixen a5242ff087 resolved conflicts		2015-11-21 12:02:55 +01: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	resolved conflicts	2015-11-21 12:02:55 +01:00