Merge branch 'MDL-40061_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 05:14:45 +0000 (13:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 05:14:45 +0000 (13:14 +0800)

Trivial merge