LevelX2 7ec9394a83 Merge origin/master ... Conflicts: Mage.Sets/src/mage/sets/AetherRevolt.java		2017-01-06 21:57:18 +01:00
..
src	Merge origin/master	2017-01-06 21:57:18 +01:00
manifest.mf
pom.xml	Xmage 1.4.19	2016-11-27 19:59:42 +01:00