Merge branch 'MDL-49741-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 07:53:15 +0000 (08:53 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Apr 2015 07:53:15 +0000 (08:53 +0100)

Trivial merge