Merge branch 'MDL-45544-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 May 2014 06:49:58 +0000 (07:49 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 27 May 2014 06:49:58 +0000 (07:49 +0100)

Trivial merge