Merge branch 'MDL-50127-master-squashed' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Aug 2015 08:54:05 +0000 (09:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:30 +0000 (18:30 +0200)

Trivial merge