Merge branch 'MDL-34818_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:22:18 +0000 (00:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:22:18 +0000 (00:22 +0100)

Trivial merge