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

Trivial merge