Merge branch 'MDL-39444_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 May 2013 14:54:06 +0000 (16:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 May 2013 14:54:06 +0000 (16:54 +0200)

Trivial merge