Merge branch 'MDL-38254' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 04:08:46 +0000 (12:08 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 10 Apr 2013 04:08:46 +0000 (12:08 +0800)

Trivial merge