Merge branch 'MDL-37355-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23...
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 01:06:44 +0000 (09:06 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 01:06:44 +0000 (09:06 +0800)

Trivial merge