Merge branch 'MDL-50009-m' of https://github.com/micaherne/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Jun 2015 13:42:21 +0000 (14:42 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Jun 2015 13:42:21 +0000 (14:42 +0100)

Trivial merge