Merge branch 'MDL-39931' of github.com:lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 05:31:34 +0000 (13:31 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 05:31:34 +0000 (13:31 +0800)

Trivial merge