Merge branch 'MDL-34259-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 04:21:41 +0000 (12:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 04:21:41 +0000 (12:21 +0800)

Trivial merge