Merge branch 'master' of caffeine:/users/www/www/ master
authorMichael Spang <mspang@csclub.uwaterloo.ca>
Sun, 11 Sep 2016 19:05:55 +0000 (15:05 -0400)
committerMichael Spang <mspang@csclub.uwaterloo.ca>
Sun, 11 Sep 2016 19:05:55 +0000 (15:05 -0400)
commite16e1028b96e07bb1671a18c153f4a0542476f32
tree2bac5ea184e96909994d997971e99a0617537103
parent17ece64cecbb8c8ce532f30446592dc95d0d3e4d
parente5161d51de860d7f0229e33796b8952409d89748
Merge branch 'master' of caffeine:/users/www/www/

Conflicts:
services/index.xml