Merge branch 'MDL-50408_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 13:49:06 +0000 (15:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 13:49:06 +0000 (15:49 +0200)

Trivial merge