Merge branch 'MDL-46792-master' of git://github.com/xow/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 20 Aug 2014 04:10:13 +0000 (12:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 20 Aug 2014 04:10:13 +0000 (12:10 +0800)

Trivial merge