Merge branch 'MDL-52335-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 07:47:14 +0000 (15:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 Dec 2015 07:47:14 +0000 (15:47 +0800)

Trivial merge