Merge branch 'MDL-48050-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 23:01:01 +0000 (00:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Nov 2014 23:01:26 +0000 (00:01 +0100)

Trivial merge