Merge branch 'MDL-33135-master-3' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:55:49 +0000 (10:55 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:55:49 +0000 (10:55 +0800)

Trivial merge