Merge branch 'MDL-47224' of git://github.com/aolley/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Sep 2014 23:26:52 +0000 (01:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Sep 2014 23:26:52 +0000 (01:26 +0200)

Trivial merge