Merge branch 'MDL-44187-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 05:56:11 +0000 (13:56 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 05:56:11 +0000 (13:56 +0800)

Trivial merge