Merge branch 'MDL-27628-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 9 Mar 2016 08:00:26 +0000 (16:00 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Mar 2016 12:17:07 +0000 (13:17 +0100)

Trivial merge