Merge branch 'MDL-47815-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 16:28:36 +0000 (17:28 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 16:28:36 +0000 (17:28 +0100)

Trivial merge