Merge branch 'MDL-34905_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Wed, 15 Aug 2012 09:54:02 +0000 (17:54 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Aug 2012 09:54:02 +0000 (17:54 +0800)

Trivial merge