Merge branch 'MDL-57002-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 00:21:31 +0000 (08:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Nov 2016 00:21:31 +0000 (08:21 +0800)
commitb0db945b112028727dfc8a7e297dd47b5beae8fa
tree53e740602cff9d87040c1cea4af7988d23c7f1e6
parent835f1f9adde75a68323830f3662bea97550304de
parent538ce414a53cd0d5d13c79ef390ce62a2987a575
Merge branch 'MDL-57002-master' of git://github.com/FMCorz/moodle