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)
Conflicts:
services/index.xml


Trivial merge