JRHerlehy 2e89952bac Merge remote-tracking branch 'origin/master' ... # Conflicts: # Mage.Sets/src/mage/cards/p/PiasRevolution.java # Mage.Sets/src/mage/sets/AetherRevolt.java		2016-12-07 00:46:19 -08:00
..
src/mage	Merge remote-tracking branch 'origin/master'	2016-12-07 00:46:19 -08:00
pom.xml	Xmage 1.4.19	2016-11-27 19:59:42 +01:00