Merge commit 'public/master' into ceod
authorMichael Spang <mspang@csclub.uwaterloo.ca>
Wed, 29 Jul 2009 17:29:42 +0000 (13:29 -0400)
committerMichael Spang <mspang@csclub.uwaterloo.ca>
Wed, 29 Jul 2009 17:29:42 +0000 (13:29 -0400)
commit5ce11709ff0e15fe23bd358959642b8c079847dd
tree2ce3396e30cd1328b771cc707bf903a33500a5dc
parentad30f9c47ab885a7b28af11906f96ad189dc312e
parentd818a687fce7bceb78861b1722efd6a449da25a6
Merge commit 'public/master' into ceod
ceo/members.py
debian/changelog