Merge branch 'MDL-29110-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Oct 2016 01:48:25 +0000 (09:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 26 Oct 2016 01:48:25 +0000 (09:48 +0800)
commit7f650fdec81659c8eb7922ea4fe379ff65429613
treef4fe3ccf800f2c92c7098fdbe23a47487f8350d1
parent7c7928b2d85f3ef13c138d666ddd6bff649e2a71
parent0ab8b3375485e9769d830e0e9d7a00b88de60770
Merge branch 'MDL-29110-master' of git://github.com/lameze/moodle