Merge branch 'MDL-34255' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 02:31:41 +0000 (10:31 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Jul 2012 02:31:41 +0000 (10:31 +0800)

Trivial merge