Merge branch 'MDL-40649_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 22 Jul 2013 04:11:43 +0000 (12:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 22 Jul 2013 04:11:43 +0000 (12:11 +0800)

Trivial merge