Merge branch 'MDL-42955_b' of git://github.com/rwijaya/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 02:37:01 +0000 (10:37 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 02:37:01 +0000 (10:37 +0800)

Trivial merge