Merge branch 'MDL-47930-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 06:18:07 +0000 (14:18 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 06:18:07 +0000 (14:18 +0800)

Trivial merge