Merge branch 'MDL-32740' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 3 May 2012 16:58:00 +0000 (00:58 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 3 May 2012 16:58:00 +0000 (00:58 +0800)

Trivial merge