Merge branch 'MDL-34835_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 13 Aug 2012 02:20:27 +0000 (10:20 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Aug 2012 02:20:27 +0000 (10:20 +0800)

Trivial merge