Merge branch 'MDL-54771-master' of git://github.com/cameron1729/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 12:53:32 +0000 (14:53 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Jul 2016 12:53:32 +0000 (14:53 +0200)

Trivial merge