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

Trivial merge