Merge branch 'MDL-50115-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 06:10:39 +0000 (14:10 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 8 Feb 2016 06:10:39 +0000 (14:10 +0800)

Trivial merge