Merge branch 'MDL-37033_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Mar 2013 01:37:07 +0000 (09:37 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Mar 2013 01:37:07 +0000 (09:37 +0800)

Trivial merge