Merge branch 'MDL-40816_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:18:52 +0000 (18:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:18:52 +0000 (18:18 +0200)

Trivial merge