Merge branch 'MDL-30157_master-fix' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Sep 2015 09:28:31 +0000 (11:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Sep 2015 09:28:31 +0000 (11:28 +0200)

Trivial merge