Merge branch 'MDL-46044-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jun 2014 10:45:29 +0000 (11:45 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jun 2014 10:45:29 +0000 (11:45 +0100)

Trivial merge