Merge branch 'MDL-33891-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Jun 2012 09:43:47 +0000 (17:43 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Jun 2012 09:43:47 +0000 (17:43 +0800)

Trivial merge