Merge branch 'MDL-50641-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Sep 2015 23:53:09 +0000 (01:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Sep 2015 23:53:09 +0000 (01:53 +0200)

Trivial merge