Merge branch 'MDL-34483_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 01:12:23 +0000 (09:12 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 01:12:23 +0000 (09:12 +0800)

Trivial merge