Merge branch 'MDL-50811-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 29 Oct 2015 10:53:40 +0000 (10:53 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Oct 2015 10:53:40 +0000 (10:53 +0000)

Trivial merge