Merge branch 'MDL-26660-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 02:33:54 +0000 (10:33 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 02:33:54 +0000 (10:33 +0800)

Trivial merge