Merge branch 'MDL-53252_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Mar 2016 05:35:32 +0000 (13:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Mar 2016 05:35:32 +0000 (13:35 +0800)

Trivial merge