Merge branch 'test-48374' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Dec 2014 01:57:24 +0000 (02:57 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:14:30 +0000 (12:14 +0000)

Trivial merge