LevelX2 37a0c321b6 Merge origin/master ... Conflicts: Mage/src/mage/abilities/effects/common/ReturnFromExileForSourceEffect.java		2015-04-03 16:53:09 +02:00
..
src/mage/sets	Merge origin/master	2015-04-03 16:53:09 +02:00
pom.xml	* Maven - Added workaround for bug in compiler plugin 3.2 that alwas all sources were compiled.	2015-02-22 11:17:25 +01:00