Merge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 14 Jan 2014 06:23:06 +0000 (14:23 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 14 Jan 2014 06:23:06 +0000 (14:23 +0800)

Trivial merge