Merge branch 'MDL-39581_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 13 May 2013 06:05:30 +0000 (14:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 13 May 2013 06:05:30 +0000 (14:05 +0800)

Trivial merge