Merge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 30 May 2012 06:14:50 +0000 (14:14 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 30 May 2012 06:14:50 +0000 (14:14 +0800)

Trivial merge