Merge branch 'MDL-58904' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 12 May 2017 02:22:19 +0000 (10:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 12 May 2017 02:22:19 +0000 (10:22 +0800)
commitd9d2c2f86f49f6a818f53dd672064f8649e05a13
tree92dd15409b33b43596c2bba70fa3f868cd8fd782
parentbcf69a655a48a4a72c55b9a3f48ebe30389697f4
parentf86e8699b9810343f21540ea55ffcd39112ef543
Merge branch 'MDL-58904' of git://github.com/stronk7/moodle