Merge branch 'MDL-30157_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 22:19:04 +0000 (00:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Sep 2015 22:19:04 +0000 (00:19 +0200)

Trivial merge