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

Trivial merge