Merge branch 'MDL-40785' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 15:50:38 +0000 (17:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 15:50:38 +0000 (17:50 +0200)

Trivial merge