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

Trivial merge