Merge branch 'MDL-51939-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 29 Oct 2015 13:54:56 +0000 (13:54 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Oct 2015 13:54:56 +0000 (13:54 +0000)

Trivial merge