Merge branch 'wip-MDL-27074-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 06:54:37 +0000 (14:54 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Mar 2015 06:54:37 +0000 (14:54 +0800)

Trivial merge