Merge branch 'wip-MDL-41937-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 12:05:10 +0000 (14:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 12:05:10 +0000 (14:05 +0200)

Trivial merge