Merge branch 'MDL-35715-master' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Oct 2012 23:48:53 +0000 (01:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Oct 2012 23:48:53 +0000 (01:48 +0200)

Trivial merge