Merge branch 'MDL-35924_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 18:41:45 +0000 (19:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 18:41:45 +0000 (19:41 +0100)

Trivial merge