Merge branch 'MDL-32459-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Apr 2012 02:42:42 +0000 (10:42 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Apr 2012 02:42:42 +0000 (10:42 +0800)

Trivial merge