Merge branch 'wip-MDL-29731-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 05:20:59 +0000 (13:20 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Jul 2013 05:20:59 +0000 (13:20 +0800)

Trivial merge