foul-magics/Mage/src/main/java
LevelX2 7ec9394a83 Merge origin/master
Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
2017-01-06 21:57:18 +01:00
..
mage Merge origin/master 2017-01-06 21:57:18 +01:00