Merge branch 'MDL-45981-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Oct 2015 00:18:10 +0000 (08:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 7 Oct 2015 00:18:10 +0000 (08:18 +0800)
commitdabb53c525820f293c9358a1be4a5b741cb00851
tree56ed1cb0e4c30b2a0dcc28801d0ccf8b8c4b648f
parentb8e0dcbb7e6f14c30717ed52f89e78cccab90d81
parentac9d9646d4054a94607ab192ed4a9ed5e0601978
Merge branch 'MDL-45981-master' of git://github.com/lameze/moodle