Merge branch 'MDL-40051_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 02:41:36 +0000 (10:41 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 02:41:36 +0000 (10:41 +0800)

Trivial merge