Merge branch 'MDL-56768-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 04:15:55 +0000 (12:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 04:15:55 +0000 (12:15 +0800)
commit9c56f904d24c31acf6e689445da47041ba7ffe3e
tree9daf1111bb855c53a63a6e010ada2c879d064e0e
parent3ecf492a75f1087d50d5680002ee31fb15cb4190
parent7becb39f638731101be8ea3786994223fe4c80cd
Merge branch 'MDL-56768-master-fix1' of github.com/damyon/moodle