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

Trivial merge