Merge branch 'MDL-54542-master-fixup' of https://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 03:52:29 +0000 (11:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 May 2016 03:52:29 +0000 (11:52 +0800)
commit9e550d5804fd5ef26351abd1540c88b002ef3f08
tree1024e18b9c80c65849e7c19b3f4ea52446359ec4
parent367c85d78cc276e11811827310a95c93ab5fed2f
parentd309f3e218047a6917f3fb1f2020bde3645a0b60
Merge branch 'MDL-54542-master-fixup' of https://github.com/FMCorz/moodle