Merge branch 'MDL-51955' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 29 Oct 2015 14:22:28 +0000 (14:22 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Oct 2015 14:22:28 +0000 (14:22 +0000)
commitca9daf0fb0f7063099967e3c66f7b3ef6e165119
treed72b0ef8fe9e3be183e75360bd57566d496742e4
parent02315eb2bb7f79e1baf33da403dc8c28e6b19b89
parentaa4a2716ef3e416eeda716d96d1ca545e8c5c0e9
Merge branch 'MDL-51955' of git://github.com/stronk7/moodle