Merge branch 'wip-MDL-34290-MOODLE_23_STABLE' of git://github.com/marinaglancy/moodle...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Aug 2012 10:11:22 +0000 (12:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Aug 2012 10:11:22 +0000 (12:11 +0200)

Trivial merge