Merge branch 'MDL-48430_master' of https://github.com/crazyserver/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 10 Dec 2014 02:29:06 +0000 (15:29 +1300)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Dec 2014 12:24:38 +0000 (13:24 +0100)

Trivial merge