Merge branch 'MDL-40759-master-fix3' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Mar 2017 03:33:11 +0000 (11:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Mar 2017 03:33:11 +0000 (11:33 +0800)
commit85ead19b34a241488fd9b366ef1c3c433d83a328
tree9217c689ff2d51dd9615f6f59dfbae772d984480
parentb7cc51ca609b5bfd6d93d38a73fceb06bc675a50
parentfe4f35b29b0561602bfef852200d546683490fff
Merge branch 'MDL-40759-master-fix3' of github.com/damyon/moodle