Merge branch 'MDL-34610_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 18:21:55 +0000 (20:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 18:21:55 +0000 (20:21 +0200)

Trivial merge