Merge branch 'MDL-55355-master-fix' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 3 Aug 2016 02:45:15 +0000 (10:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 3 Aug 2016 02:45:15 +0000 (10:45 +0800)
commit079e06adcdeb6a068eb8b90a945930d5ec9031ed
tree1214a21c5ae4f38a89b5ba14c7ed31852c4bf147
parent4a3a49353c283106b99fec3dddeb696464dddfed
parent472ac2d39033b9d1ed72d5885ea933ed784ffadd
Merge branch 'MDL-55355-master-fix' of https://github.com/lameze/moodle