Merge branch '48425-48374-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Dec 2014 02:12:27 +0000 (03:12 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:14:30 +0000 (12:14 +0000)

Trivial merge