Merge branch 'MDL-28512_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 00:02:34 +0000 (01:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2013 00:02:34 +0000 (01:02 +0100)

Trivial merge