Merge branch '3034-28' of https://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 13:04:24 +0000 (14:04 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 13:04:24 +0000 (14:04 +0100)

Trivial merge