Merge branch 'MDL-37952_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 01:46:28 +0000 (09:46 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Feb 2013 01:46:28 +0000 (09:46 +0800)

Trivial merge