Merge branch 'MDL-46613-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Sep 2014 16:42:17 +0000 (18:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Sep 2014 16:42:17 +0000 (18:42 +0200)

Trivial merge