Merge branch 'MDL-34226_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jul 2012 05:53:58 +0000 (13:53 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jul 2012 05:53:58 +0000 (13:53 +0800)

Trivial merge