Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Jun 2013 05:10:12 +0000 (13:10 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Jun 2013 05:10:12 +0000 (13:10 +0800)

Trivial merge