Merge branch 'MDL-36257-master' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 01:05:27 +0000 (02:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 01:05:27 +0000 (02:05 +0100)

Trivial merge