Merge branch 'MDL-44925-master' of https://github.com/dthies/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 13:33:33 +0000 (14:33 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 13:33:33 +0000 (14:33 +0100)

Trivial merge