Merge branch 'MDL-37194-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23...
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 02:43:44 +0000 (10:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 02:43:44 +0000 (10:43 +0800)

Trivial merge