Merge branch 'MDL-49677' of https://github.com/sleperf/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 10:28:35 +0000 (11:28 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Apr 2015 10:28:35 +0000 (11:28 +0100)

Trivial merge