Merge branch 'MDL-52835-master' of git://github.com/deraadt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jan 2016 14:14:45 +0000 (14:14 +0000)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:19 +0000 (10:15 +0800)

Trivial merge