Merge branch 'MDL-36773-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 01:56:47 +0000 (09:56 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 01:56:47 +0000 (09:56 +0800)

Trivial merge