Merge branch 'master' of csclub:~git/public/csc-status
authorMatthew McPherrin <matthew@mcpherrin.ca>
Tue, 13 Mar 2012 16:45:03 +0000 (12:45 -0400)
committerMatthew McPherrin <matthew@mcpherrin.ca>
Tue, 13 Mar 2012 16:45:03 +0000 (12:45 -0400)

Trivial merge