Merge branch 'MDL-33073-master-1' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 17 May 2012 13:04:30 +0000 (21:04 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 17 May 2012 13:04:30 +0000 (21:04 +0800)

Trivial merge