Merge branch 'MDL-37518_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 23:13:48 +0000 (00:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 23:13:48 +0000 (00:13 +0100)

Trivial merge