Merge branch 'MDL-41728-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 19:17:05 +0000 (21:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 19:17:05 +0000 (21:17 +0200)

Trivial merge