Merge branch 'MDL-45843-master-fix1' of http://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 17 Oct 2014 08:34:39 +0000 (09:34 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 17 Oct 2014 08:34:39 +0000 (09:34 +0100)

Trivial merge