Merge branch 'MDL-46647-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 9 Oct 2014 06:05:09 +0000 (07:05 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 9 Oct 2014 06:05:09 +0000 (07:05 +0100)

Trivial merge