Merge branch 'MDL-33608-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 06:02:05 +0000 (14:02 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Jun 2012 06:02:05 +0000 (14:02 +0800)

Trivial merge