Merge branch 'MDL-38865-master' of https://github.com/mackensen/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Apr 2013 05:20:52 +0000 (13:20 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Apr 2013 05:20:52 +0000 (13:20 +0800)

Trivial merge