Merge branch 'MDL-37533-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 14:35:20 +0000 (15:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 14:35:20 +0000 (15:35 +0100)

Trivial merge