Merge branch 'MDL-34702_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 00:11:07 +0000 (02:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Aug 2012 00:11:07 +0000 (02:11 +0200)

Trivial merge