Merge branch 'MDL-32009-master-3' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 May 2012 03:07:28 +0000 (11:07 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 May 2012 03:07:28 +0000 (11:07 +0800)

Trivial merge