Merge branch 'MDL-43273-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 08:16:48 +0000 (16:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 08:16:48 +0000 (16:16 +0800)

Trivial merge