Merge branch 'wip-MDL-43283-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 Jan 2014 22:07:19 +0000 (23:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 Jan 2014 22:07:19 +0000 (23:07 +0100)

Trivial merge