Merge branch 'MDL-32806_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 03:53:36 +0000 (11:53 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 03:53:36 +0000 (11:53 +0800)

Trivial merge