Merge branch 'MDL-48054-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 20:34:37 +0000 (21:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 20:34:37 +0000 (21:34 +0100)

Trivial merge