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

Trivial merge