Merge branch 'MDL-37872-m' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 22:26:09 +0000 (23:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Feb 2013 22:26:09 +0000 (23:26 +0100)

Trivial merge