Merge branch 'wip-MDL-42925-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Nov 2013 07:43:44 +0000 (15:43 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Nov 2013 07:43:44 +0000 (15:43 +0800)

Trivial merge