Merge branch 'MDL-31209-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 May 2013 17:05:59 +0000 (19:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 May 2013 17:05:59 +0000 (19:05 +0200)

Trivial merge