Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Jan 2013 10:13:13 +0000 (11:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Jan 2013 10:13:13 +0000 (11:13 +0100)

Trivial merge