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

Trivial merge