Merge branch 'MDL-50749-master' of https://github.com/mackensen/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Jul 2015 07:38:43 +0000 (08:38 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Jul 2015 07:38:43 +0000 (08:38 +0100)

Trivial merge