Merge branch 'MDL-48838_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Mar 2016 04:06:48 +0000 (12:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Mar 2016 04:06:48 +0000 (12:06 +0800)

Trivial merge