Merge branch 'MDL-38666-m' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 23:04:00 +0000 (01:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 23:04:00 +0000 (01:04 +0200)

Trivial merge