Merge branch 'MDL-32739' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 3 May 2012 13:23:19 +0000 (21:23 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 3 May 2012 13:23:19 +0000 (21:23 +0800)

Trivial merge