Merge branch 'MDL-35026_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 15:54:20 +0000 (17:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 15:54:20 +0000 (17:54 +0200)

Trivial merge