Merge branch 'MDL-43105-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 18:15:05 +0000 (19:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 18:15:05 +0000 (19:15 +0100)

Trivial merge