Merge branch 'MDL-33322' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 Jun 2012 05:02:38 +0000 (13:02 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Jun 2012 05:02:38 +0000 (13:02 +0800)

Trivial merge