rebase changes
authorJoseph Baxter <joseph.baxter@nottingham.ac.uk>
Tue, 3 Jun 2014 13:41:35 +0000 (14:41 +0100)
committerJoseph Baxter <joseph.baxter@nottingham.ac.uk>
Tue, 3 Jun 2014 13:41:35 +0000 (14:41 +0100)
commit750a15a38d1061a3f26a4bd1c80ab1ea6b47f7c6
tree8caa0ac9fc045700535fe2f6efda5feb9e8373d4
parentd4fd1f4b4db9615b04655e03ee652aadf452ca1b
parent24683d313d1f2bc476c89d6e34f4a09165980604
rebase changes
db/upgrade.php
locallib.php
renderer.php