Merge branch 'MDL-51986-master' of git://github.com/dpalou/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 Mar 2016 05:59:21 +0000 (13:59 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 Mar 2016 05:59:21 +0000 (13:59 +0800)

Trivial merge