Merge branch 'MDL-50685_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2015 00:15:51 +0000 (02:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2015 00:15:51 +0000 (02:15 +0200)

Trivial merge