Merge branch 'MDL-34738_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 01:42:12 +0000 (09:42 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Aug 2012 01:42:12 +0000 (09:42 +0800)

Trivial merge