Merge branch 'MDL-37375' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 04:43:47 +0000 (12:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jan 2013 04:43:47 +0000 (12:43 +0800)

Trivial merge