Merge branch 'MDL-43930-master-fix1' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 06:13:23 +0000 (14:13 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Mar 2014 06:13:23 +0000 (14:13 +0800)

Trivial merge