Merge branch 'MDL-31262' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 01:18:05 +0000 (03:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 01:18:05 +0000 (03:18 +0200)

Trivial merge