Merge branch 'MDL-38658-m' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 24 Mar 2013 22:40:50 +0000 (23:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 24 Mar 2013 22:40:50 +0000 (23:40 +0100)

Trivial merge