Merge branch 'MDL-47385-master' of https://github.com/DmitryNefedov/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 10:41:37 +0000 (11:41 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 10:41:37 +0000 (11:41 +0100)

Trivial merge