Merge branch 'MDL-28207-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 02:40:40 +0000 (10:40 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 02:40:40 +0000 (10:40 +0800)

Trivial merge