Merge branch 'MDL-31622-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 03:34:21 +0000 (11:34 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 16 Jul 2012 03:34:21 +0000 (11:34 +0800)

Trivial merge