Merge branch 'MDL-42815-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Dec 2013 22:24:56 +0000 (23:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Dec 2013 22:24:56 +0000 (23:24 +0100)

Trivial merge