Merge branch 'master_MDL-44712' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 09:33:31 +0000 (10:33 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 09:33:31 +0000 (10:33 +0100)
commit4d67694b10cecceefae3457cfcde988d5b5acc7f
tree9041958abbfa8fcb40181fd25c56fe44b7a75ed5
parenta55ff4d9fe07ea21c27db8ee630cc987ae8170f1
parentb30a884bfa6ecab95648243e3ef6b256ce4f6656
Merge branch 'master_MDL-44712' of git://github.com/danmarsden/moodle