Merge branch 'MDL-37845_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDamyon Wiese <damyon@moodle.com>
Mon, 29 Apr 2013 03:47:02 +0000 (11:47 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 29 Apr 2013 03:47:02 +0000 (11:47 +0800)

Trivial merge