Merge branch 'MDL-45818_master' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:15:24 +0000 (15:15 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 1 Sep 2014 07:15:24 +0000 (15:15 +0800)

Trivial merge