Merge branch 'MDL-44927-master-fix2' of https://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Apr 2014 06:09:15 +0000 (14:09 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Apr 2014 06:09:15 +0000 (14:09 +0800)

Trivial merge