Merge branch 'wip-MDL-33563-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2013 20:36:23 +0000 (22:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2013 20:36:23 +0000 (22:36 +0200)

Trivial merge