Merge branch 'MDL-42714-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Nov 2013 22:35:37 +0000 (23:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Nov 2013 22:35:37 +0000 (23:35 +0100)

Trivial merge