Merge branch 'MDL-36442_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:18:20 +0000 (13:18 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Nov 2012 05:18:20 +0000 (13:18 +0800)

Trivial merge