Merge branch 'MDL-38390' of git://github.com/jonof/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 05:12:29 +0000 (13:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 05:12:29 +0000 (13:12 +0800)

Trivial merge