Merge branch 'MDL-54948-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 22 Jun 2016 06:43:35 +0000 (14:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 22 Jun 2016 06:43:35 +0000 (14:43 +0800)
commit1331869eb2dd5a924bb953a557dde5ba6ecf16c8
treec74c8341f7723fd84a03d1cda09d8a4755aa4950
parent6c8e98ddd2a6d85c5d8454dd7cc7f40557d748a2
parent84440fe3d26e7126ebba704e4bd201ff05e49dd3
Merge branch 'MDL-54948-master-fix' of https://github.com/lameze/moodle