Merge branch 'MDL-42195-master-fix2' of https://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 07:32:30 +0000 (15:32 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 07:32:30 +0000 (15:32 +0800)

Trivial merge