Merge branch 'MDL-50801_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 17:14:00 +0000 (19:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 17:14:00 +0000 (19:14 +0200)

Trivial merge