Merge branch 'MDL-33588-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 09:16:40 +0000 (17:16 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 09:16:40 +0000 (17:16 +0800)

Trivial merge