Merge branch 'MDL-52207-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 03:53:30 +0000 (11:53 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 03:53:30 +0000 (11:53 +0800)

Trivial merge