Merge branch 'MDL-24408_2' of https://github.com/oasychev/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 01:14:06 +0000 (03:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 01:14:06 +0000 (03:14 +0200)

Trivial merge