Merge branch 'MDL-26940-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 24 Sep 2012 07:32:31 +0000 (15:32 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Sep 2012 07:32:31 +0000 (15:32 +0800)

Trivial merge