Merge branch 'proposal'
authorSean Hunt <scshunt@csclub.uwaterloo.ca>
Fri, 19 Sep 2014 23:14:36 +0000 (19:14 -0400)
committerSean Hunt <scshunt@csclub.uwaterloo.ca>
Fri, 19 Sep 2014 23:14:36 +0000 (19:14 -0400)
commitc154ddc8bc75c81b41a5751077fa12121f84cb8b
treeaeb9d049aed19576d1996aabe67fdbcac306d18d
parentf3cdafa95abdf1cfb79dfb7798f17c99618667b2
parentaf293b4816f74c7c1185b20aa67d0188f06c8e39
Merge branch 'proposal'

Constitution changes approved at meeting September 19, 2014.