Merge branch 'MDL-35073_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 5 Apr 2013 09:39:13 +0000 (17:39 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 5 Apr 2013 09:39:13 +0000 (17:39 +0800)

Trivial merge