Merge branch 'MDL-52599_master' of https://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 May 2016 07:42:49 +0000 (15:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:14 +0000 (17:16 +0800)

Trivial merge