Merge branch 'MDL-28692_master' of git://github.com/lazydaisy/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 05:32:25 +0000 (13:32 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 05:32:25 +0000 (13:32 +0800)

Trivial merge