Merge branch 'MDL-58220-master-fix2' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 06:43:13 +0000 (14:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 06:43:13 +0000 (14:43 +0800)
commit3aa424703b95a10d98cabc8c84f9fb9cee52d749
treecd242c2bfb716d5ee85ed13c22ba06662adafc2b
parent941cb7ce3c0692f6ec9a819630c0c6db081caabc
parenta647e7d762cf071bf36fc3d1be26aa81f511ea12
Merge branch 'MDL-58220-master-fix2' of github.com/damyon/moodle