Merge branch 'MDL-35744_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 22:40:35 +0000 (00:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 22:40:35 +0000 (00:40 +0200)

Trivial merge