Merge branch 'wip-MDL-43006-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 26 Nov 2013 05:24:02 +0000 (13:24 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Nov 2013 05:24:02 +0000 (13:24 +0800)

Trivial merge