Merge branch 'MDL-32742-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 06:21:57 +0000 (14:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 06:21:57 +0000 (14:21 +0800)

Trivial merge