Merge branch 'MDL-51737-master-3' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 22 Oct 2015 13:43:20 +0000 (14:43 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 22 Oct 2015 13:43:20 +0000 (14:43 +0100)
commit0a059078733ac7996e3680588d65458d21c0781b
tree6a101d958d9c20aef0f8cb95545f735b25f72252
parentcf84a5d2dd126de835671b36d7d1938c6d4f75af
parent39a731efb49c161bb4a816d2eaaae59c08dc108f
Merge branch 'MDL-51737-master-3' of git://github.com/andrewnicols/moodle