Merge branch 'MDL-50092_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 May 2015 12:58:14 +0000 (13:58 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 May 2015 12:58:14 +0000 (13:58 +0100)

Trivial merge