Merge branch 'MDL-50391-master' of git://github.com/aspark21/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 18 Aug 2015 04:09:49 +0000 (12:09 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:28 +0000 (18:30 +0200)

Trivial merge