Merge branch 'MDL-35349_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 10:55:10 +0000 (18:55 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 10:55:10 +0000 (18:55 +0800)

Trivial merge