Merge branch 'MDL-39508_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 May 2013 13:42:44 +0000 (14:42 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 May 2013 13:42:44 +0000 (14:42 +0100)

Trivial merge