Merge branch 'equella' of git://github.com/danpoltawski/moodle