Merge branch 'wip-MDL-50919-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Sep 2015 09:42:11 +0000 (11:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Sep 2015 09:42:11 +0000 (11:42 +0200)

Trivial merge