North 1fccbd6b87 Merge remote-tracking branch 'origin/master' into decouple-client ... Conflicts: Mage/src/mage/cards/repository/CardRepository.java		2013-06-30 11:26:40 +03:00
..
mage	Merge remote-tracking branch 'origin/master' into decouple-client	2013-06-30 11:26:40 +03:00
org/mage	Merge remote-tracking branch 'origin/master' into decouple-client	2013-06-30 11:26:40 +03:00