Merge branch 'MDL-41839-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 00:33:30 +0000 (02:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Sep 2013 00:33:30 +0000 (02:33 +0200)

Trivial merge