Merge branch 'MDL-56241-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Nov 2016 02:22:25 +0000 (10:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Nov 2016 02:22:25 +0000 (10:22 +0800)
commit3e24a75ec3830ec83b48a6a51c38ed2074fd3d4d
treec5063f8186583e97379016f0bab8a845a2a19c01
parentcf36f123d5437127f3f1ed7aed50f3ecda8e0c5d
parent1d4928003c82011e2671500eaea5c5a02048ccc3
Merge branch 'MDL-56241-master' of git://github.com/damyon/moodle