Merge branch 'MDL-34937_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:19:30 +0000 (14:19 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:19:30 +0000 (14:19 +0800)

Trivial merge