Merge branch 'MDL-38279_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Tue, 5 Mar 2013 07:37:13 +0000 (15:37 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 5 Mar 2013 07:37:13 +0000 (15:37 +0800)

Trivial merge