Merge branch 'MDL-35147_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Aug 2012 18:12:31 +0000 (20:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Aug 2012 18:12:31 +0000 (20:12 +0200)

Trivial merge