Merge branch 'wip-MDL-34346-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 02:57:50 +0000 (10:57 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 02:57:50 +0000 (10:57 +0800)

Trivial merge