Merge branch 'MDL-34783-master-1' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Aug 2012 20:45:06 +0000 (22:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Aug 2012 20:45:06 +0000 (22:45 +0200)

Trivial merge