Merge branch 'MDL-29835_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:42:09 +0000 (12:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:42:09 +0000 (12:42 +0800)

Trivial merge