Merge branch 'MDL-21801_b' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 02:29:49 +0000 (10:29 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Oct 2012 02:29:49 +0000 (10:29 +0800)

Trivial merge