Merge branch 'wip-MDL-18598-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Apr 2014 01:45:07 +0000 (09:45 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Apr 2014 01:45:07 +0000 (09:45 +0800)

Trivial merge