Merge branch 'MDL-58431-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 03:01:39 +0000 (11:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 03:01:39 +0000 (11:01 +0800)
commitedf1ea10ca701643e94ff49a9dfdf392b8a7499f
tree29c951222ff4009d15e2ad75b652d51ce7ff8699
parentbde7f06ce883e35b1fdd04a90515cc3cf65cdb2c
parent78681d03b0afcf18b662f63fff98f38bc77fec90
Merge branch 'MDL-58431-master' of git://github.com/jleyva/moodle