Merge branch 'wip-MDL-41062-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Jan 2014 07:29:15 +0000 (15:29 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Jan 2014 07:29:15 +0000 (15:29 +0800)

Trivial merge