Merge branch 'MDL-37396' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 06:22:02 +0000 (14:22 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Feb 2013 06:22:02 +0000 (14:22 +0800)

Trivial merge