Merge branch 'MDL-34164_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 02:05:51 +0000 (10:05 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 02:05:51 +0000 (10:05 +0800)

Trivial merge