Merge branch 'MDL-29758_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2013 00:54:33 +0000 (02:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 10 May 2013 00:54:33 +0000 (02:54 +0200)

Trivial merge