Merge branch 'MDL-43856-master-fix1' of https://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 09:37:24 +0000 (17:37 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 09:37:24 +0000 (17:37 +0800)

Trivial merge