Merge branch 'MDL-29771' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Jun 2015 14:13:18 +0000 (16:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Jun 2015 14:13:18 +0000 (16:13 +0200)

Trivial merge