Merge branch 'MDL-39835_M26' of github.com:lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 06:44:35 +0000 (14:44 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Jun 2013 06:44:35 +0000 (14:44 +0800)

Trivial merge