Merge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jan 2014 18:10:13 +0000 (19:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jan 2014 18:10:13 +0000 (19:10 +0100)

Trivial merge