Merge branch 'master' of /users/git/public/csc-status
authorMatthew McPherrin <matthew@mcpherrin.ca>
Wed, 17 Oct 2012 23:28:08 +0000 (19:28 -0400)
committerMatthew McPherrin <matthew@mcpherrin.ca>
Wed, 17 Oct 2012 23:28:08 +0000 (19:28 -0400)
commit365e27f9e42ad05adda41249cb057f77f06e7eb1
tree0b7efc8b2a918a81244d529de08c5e6a7546c9b2
parent3d6c1630835a00e148a6671085a30ab2ebc33b90
parent274cc21040879fec1afaa4f62fa374764e4c8a1c
Merge branch 'master' of /users/git/public/csc-status

Conflicts:
tests.d/50_website.py
tests.d/50_website.py