Merge branch 'MDL-49736_master' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Apr 2015 13:42:39 +0000 (21:42 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Apr 2015 13:42:39 +0000 (21:42 +0800)

Trivial merge