Merge branch 'MDL-40275-m' of git://github.com/micaherne/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jul 2013 19:52:17 +0000 (21:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jul 2013 19:52:17 +0000 (21:52 +0200)

Trivial merge