Merge branch 'MDL-46167-master' of https://github.com/mackensen/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 18 Aug 2015 08:28:06 +0000 (09:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:28 +0000 (18:30 +0200)

Trivial merge