Merge branch 'MDL-33167' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 02:18:45 +0000 (10:18 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 May 2012 02:18:45 +0000 (10:18 +0800)

Trivial merge