Merge branch 'MDL-57290_master' of https://github.com/nadavkav/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Apr 2017 00:43:36 +0000 (08:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Apr 2017 00:43:36 +0000 (08:43 +0800)
commit18baa6c9566116f7688ffb848360f7edb9dac333
treed667fa95a2c27c4fa766bea064ebe9f280d7c41d
parenteda9dbcfe02536e68e225bca0d88791eb746eee2
parent85b0d4a9cb57a09f55556313fd5a82265e86cbc3
Merge branch 'MDL-57290_master' of https://github.com/nadavkav/moodle