Merge branch 'MDL-41566' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 09:30:04 +0000 (17:30 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 09:30:04 +0000 (17:30 +0800)

Trivial merge