Merge branch 'MDL-42835-master' of http://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 12 Jun 2014 07:51:11 +0000 (09:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 12 Jun 2014 07:51:11 +0000 (09:51 +0200)

Trivial merge