Merge branch 'MDL-37864' of https://github.com/serega1394/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 18:53:46 +0000 (19:53 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 18:53:46 +0000 (19:53 +0100)

Trivial merge