Merge branch 'MDL-41595_M26' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 00:15:06 +0000 (02:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 00:15:06 +0000 (02:15 +0200)

Trivial merge