Merge branch 'wip-MDL-39520-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 May 2013 11:33:19 +0000 (12:33 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 May 2013 11:33:19 +0000 (12:33 +0100)

Trivial merge