Merge branch 'master_MDL-44548' of git://github.com/danmarsden/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 02:04:14 +0000 (10:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Mar 2015 02:04:14 +0000 (10:04 +0800)

Trivial merge