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

Trivial merge