Merge branch 'MDL-40493-master-fix1' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 09:01:10 +0000 (17:01 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Oct 2013 09:01:10 +0000 (17:01 +0800)

Trivial merge