Merge branch 'MDL-36934-master' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Dec 2012 08:48:13 +0000 (09:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Dec 2012 08:48:13 +0000 (09:48 +0100)

Trivial merge