Merge branch 'MDL-47227_master' of https://github.com/crazyserver/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 06:44:08 +0000 (14:44 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 29 Oct 2014 06:44:08 +0000 (14:44 +0800)

Trivial merge