Merge branch 'MDL-30377_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 03:53:21 +0000 (11:53 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 03:53:21 +0000 (11:53 +0800)

Trivial merge