Merge branch 'MDL-46017-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Jul 2014 07:24:24 +0000 (08:24 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Jul 2014 07:24:24 +0000 (08:24 +0100)

Trivial merge