Derek Monturo 217b4919f3 Merge remote-tracking branch 'upstream/master'		2017-04-17 10:35:13 -04:00
..
cards	Merge remote-tracking branch 'upstream/master'	2017-04-17 10:35:13 -04:00
sets	Merge pull request #3106 from Ketsuban/ogw-fullart-wastes	2017-04-17 08:14:14 +02:00