Merge branch 'MDL-47995-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Jun 2015 09:10:41 +0000 (11:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Jun 2015 09:10:41 +0000 (11:10 +0200)

Trivial merge