Merge branch 'MDL-48946-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 23:56:51 +0000 (00:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jan 2015 23:56:51 +0000 (00:56 +0100)

Trivial merge