Merge branch 'MDL-37358-master' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 01:05:46 +0000 (09:05 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 01:05:46 +0000 (09:05 +0800)

Trivial merge