Merge branch 'MDL-34624' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 03:10:29 +0000 (11:10 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 03:10:29 +0000 (11:10 +0800)

Trivial merge