Merge branch 'MDL-36380-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 06:18:46 +0000 (14:18 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 06:18:46 +0000 (14:18 +0800)

Trivial merge