Merge branch 'MDL-31951' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 06:23:41 +0000 (14:23 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 14 May 2012 06:23:41 +0000 (14:23 +0800)

Trivial merge