Merge branch 'MDL-34957_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:23:28 +0000 (14:23 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Aug 2012 06:23:28 +0000 (14:23 +0800)

Trivial merge