Merge branch 'MDL-32865' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 04:05:36 +0000 (12:05 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 04:05:36 +0000 (12:05 +0800)

Trivial merge