Merge branch 'master' of /users/j3parker/www
authorJenny Wong <jy2wong@uwaterloo.ca>
Fri, 24 Feb 2012 21:49:41 +0000 (16:49 -0500)
committerJenny Wong <jy2wong@uwaterloo.ca>
Fri, 24 Feb 2012 21:49:41 +0000 (16:49 -0500)
commit1604893c312af6611cb878005f23f6d55b3a002b
treeb0e08502c0481e750230075d4a629d5536355d79
parent58b10d477e19afcbc13048fa9cc20814d05fe89e
parentd0a579ab51b679e62e520737bbd855008701473f
Merge branch 'master' of /users/j3parker/www

Conflicts:
.htaccess
srv/About/Constitution/index.md