Merge branch 'MDL-57127-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 06:27:23 +0000 (14:27 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 06:27:23 +0000 (14:27 +0800)
commit432ed35484b3a7fdea63dbf02eecd19c35c6fbdd
treed5f252757e3d799f1c36aef7f2e6ac781f5f6f4f
parentf4aec377fcbee666d5e618a5d8c02b6823d15550
parent061a39ac5de19688ac14c90eb09e6956ba1fdd77
Merge branch 'MDL-57127-master' of git://github.com/FMCorz/moodle