Merge branch 'MDL-33821-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Jun 2012 05:27:07 +0000 (13:27 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Jun 2012 05:27:07 +0000 (13:27 +0800)

Trivial merge