Merge branch 'MDL-53920_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 May 2016 05:43:59 +0000 (13:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 May 2016 05:43:59 +0000 (13:43 +0800)
commit5ba312bf5bd13d6a14ec150680172203ddb0d886
treed7c6b0c9ab5daa7c8402aac4c045e5a1777810c5
parentb9b51b210bc05542ced81b796a100dc31e980d8f
parent02113beb100099406fb036c3dd5af31a34c26e73
Merge branch 'MDL-53920_master' of git://github.com/markn86/moodle