Merge branch 'MDL-45874' of https://github.com/danielneis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Aug 2014 21:58:27 +0000 (23:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Aug 2014 21:58:27 +0000 (23:58 +0200)

Trivial merge