Merge branch 'MDL-33577' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 Jun 2012 15:15:45 +0000 (23:15 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Jun 2012 15:15:45 +0000 (23:15 +0800)

Trivial merge