Merge branch 'MDL-52071-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 12 Nov 2015 23:47:58 +0000 (07:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 12 Nov 2015 23:47:58 +0000 (07:47 +0800)

Trivial merge