Merge branch 'wip-MDL-45154-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 01:57:21 +0000 (09:57 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 01:57:21 +0000 (09:57 +0800)

Trivial merge