Merge branch 'MDL-38713-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 2 Apr 2013 05:23:00 +0000 (13:23 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 2 Apr 2013 05:23:00 +0000 (13:23 +0800)

Trivial merge