Justin Herlehy 557019e8a6 Merge pull request #2679 from JRHerlehy/master ... [CN2] Refactor Council's Dilemma voting.		2016-12-13 02:02:43 -08:00
..
java/mage	Merge pull request #2679 from JRHerlehy/master	2016-12-13 02:02:43 -08:00
proto	specify proto2 syntax	2016-11-05 11:26:30 -07:00