Merge branch 'MDL-50710-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Dec 2015 03:40:46 +0000 (11:40 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 3 Dec 2015 17:50:02 +0000 (18:50 +0100)

Trivial merge