Merge branch 'wip-MDL-44686-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Mar 2014 21:15:50 +0000 (05:15 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Mar 2014 21:15:50 +0000 (05:15 +0800)

Trivial merge