Merge branch 'MDL-27818_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 23:07:51 +0000 (01:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 23:07:51 +0000 (01:07 +0200)

Trivial merge