Merge branch 'MDL-42956-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 May 2014 02:18:44 +0000 (10:18 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 May 2014 02:18:44 +0000 (10:18 +0800)

Trivial merge