Merge branch 'MDL-34733_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Wed, 22 Aug 2012 01:16:18 +0000 (09:16 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 22 Aug 2012 01:16:18 +0000 (09:16 +0800)

Trivial merge