Merge branch 'MDL-36549' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 06:18:32 +0000 (14:18 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Dec 2012 06:18:32 +0000 (14:18 +0800)

Trivial merge