Merge branch 'MDL-54941-master-fixes' of https://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 3 Aug 2016 06:35:08 +0000 (14:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 3 Aug 2016 06:35:08 +0000 (14:35 +0800)
commit073122602320dbfb6cef2d38d4751b8d0436f06c
treeb5901bc187a7376bfde0e3429bc0945949260897
parent079e06adcdeb6a068eb8b90a945930d5ec9031ed
parent1a354b81b6270d57305480f564830d91fd5b5b85
Merge branch 'MDL-54941-master-fixes' of https://github.com/andrewnicols/moodle