Merge branch 'MDL-46591-master' of git://github.com/danpoltawski/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Jul 2014 15:32:52 +0000 (16:32 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Jul 2014 15:32:52 +0000 (16:32 +0100)

Trivial merge