Merge branch 'MDL-44806-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Apr 2014 04:07:15 +0000 (12:07 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Apr 2014 04:07:15 +0000 (12:07 +0800)

Trivial merge