Merge branch 'wip-MDL-31890-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Sep 2013 01:53:22 +0000 (09:53 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Sep 2013 01:53:22 +0000 (09:53 +0800)

Trivial merge