Merge branch 'MDL-40255_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 17:25:53 +0000 (19:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 17:25:53 +0000 (19:25 +0200)

Trivial merge