Merge branch 'MDL-51935-master' of git://github.com/dpalou/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Nov 2015 01:59:36 +0000 (09:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Nov 2015 01:59:36 +0000 (09:59 +0800)

Trivial merge