Merge branch 'MDL-46236' of git://github.com/nobelium/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Jul 2014 11:04:29 +0000 (12:04 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Jul 2014 11:04:29 +0000 (12:04 +0100)

Trivial merge