Merge branch 'MDL-49581_m30v4' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jul 2015 01:32:11 +0000 (09:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jul 2015 01:32:11 +0000 (09:32 +0800)
commitad913a2d97b4615cc31185c9661b33cff4f3d8f5
tree30be613bbf0684b4f922558fcf7af52f70fe9418
parent8b5668525386180931de1ed17bf6c65a6a9682da
parent58459ff0f06e19fbb408b8c625f06f4f744c428f
Merge branch 'MDL-49581_m30v4' of https://github.com/sbourget/moodle