Merge branch 'MDL-38282_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Tue, 5 Mar 2013 08:14:55 +0000 (16:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 5 Mar 2013 08:14:55 +0000 (16:14 +0800)

Trivial merge