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

Trivial merge