Merge branch 'MDL-52029-31' of git://github.com/vadimonus/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 07:42:27 +0000 (15:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Nov 2015 07:42:27 +0000 (15:42 +0800)

Trivial merge