Merge branch 'MDL-37526-m' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 22:33:22 +0000 (23:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 22:33:22 +0000 (23:33 +0100)

Trivial merge