Merge branch 'MDL-25853-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 02:14:07 +0000 (10:14 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 02:14:07 +0000 (10:14 +0800)

Trivial merge