Merge branch 'wip-MDL-30315-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Aug 2015 12:20:01 +0000 (13:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:33 +0000 (18:30 +0200)

Trivial merge