Merge branch 'MDL-47686-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 09:39:12 +0000 (10:39 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 09:39:12 +0000 (10:39 +0100)

Trivial merge