Samuel Sandeen 434be545f7 Merge remote-tracking branch 'magefree/master' ... # Conflicts: # Mage/src/main/java/mage/abilities/condition/common/SourceHasSubtypeCondi tion.java # Mage/src/main/java/mage/game/permanent/PermanentToken.java		2016-09-03 20:06:33 -04:00
..
java/mage	Merge remote-tracking branch 'magefree/master'	2016-09-03 20:06:33 -04:00
proto	Add user rating using Glicko rating system (#1498)	2016-05-17 17:22:14 +03:00