Merge branch 'MDL-52095_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Nov 2015 18:29:35 +0000 (19:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Nov 2015 18:29:35 +0000 (19:29 +0100)

Trivial merge