Merge branch 'MDL-39932_23' of git://github.com/grabs/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 17:11:03 +0000 (19:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 17:11:03 +0000 (19:11 +0200)

Trivial merge