Merge branch 'MDL-39167_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Fri, 19 Apr 2013 05:29:41 +0000 (13:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 19 Apr 2013 05:29:41 +0000 (13:29 +0800)

Trivial merge