LevelX2 1c085b30e2 Merge origin/master ... Conflicts: Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java		2015-04-03 16:53:50 +02:00
..
src/mage	Merge origin/master	2015-04-03 16:53:50 +02:00
manifest.mf
pom.xml	Minor change to POM.	2015-02-27 01:08:24 +01:00