Merge branch 'wip-MDL-39177-m23' of git://github.com/marinaglancy/moodle into MOODLE_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 May 2013 14:00:33 +0000 (16:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 May 2013 14:00:33 +0000 (16:00 +0200)

Trivial merge