Merge branch 'MDL-37313_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 01:40:07 +0000 (09:40 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 01:40:07 +0000 (09:40 +0800)

Trivial merge