Merge branch 'MDL-40119-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 01:15:03 +0000 (02:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Jan 2014 01:15:03 +0000 (02:15 +0100)

Trivial merge