Merge branch 'MDL-30235' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Mar 2012 04:37:08 +0000 (12:37 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Mar 2012 04:37:08 +0000 (12:37 +0800)

Trivial merge