Merge branch 'wip-MDL-17929-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 28 Apr 2015 03:42:10 +0000 (11:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Apr 2015 09:11:18 +0000 (10:11 +0100)

Trivial merge