Merge branch 'MDL-37181_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2013 21:32:30 +0000 (23:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2013 21:32:30 +0000 (23:32 +0200)

Trivial merge