Merge branch 'MDL-38515-m' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 11:51:47 +0000 (12:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 11:51:47 +0000 (12:51 +0100)

Trivial merge