Merge branch 'MDL-51704-master' of git://github.com/dpalou/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 1 Feb 2016 09:19:59 +0000 (17:19 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 1 Feb 2016 09:19:59 +0000 (17:19 +0800)

Trivial merge