Merge branch 'MDL-46772-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 19 Aug 2014 07:41:32 +0000 (15:41 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 19 Aug 2014 07:41:32 +0000 (15:41 +0800)

Trivial merge