Merge branch 'MDL-33875' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Jun 2012 05:45:49 +0000 (13:45 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Jun 2012 05:45:49 +0000 (13:45 +0800)

Trivial merge