Merge branch 'MDL-39535_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 10 May 2013 02:30:51 +0000 (10:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 10 May 2013 02:30:51 +0000 (10:30 +0800)

Trivial merge