Merge branch 'MDL-41387_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Aug 2013 19:00:12 +0000 (21:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Aug 2013 19:00:12 +0000 (21:00 +0200)

Trivial merge