Merge branch 'wip-MDL-41102-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:18:54 +0000 (02:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:18:54 +0000 (02:18 +0200)

Trivial merge