Merge branch 'MDL-54879-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Aug 2016 01:10:19 +0000 (09:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 2 Aug 2016 01:10:19 +0000 (09:10 +0800)
commitb34d7e700b32b21765efa788f8173ab96276bcc3
treef44ed4e12694286e85f340f73ef9ed749cffc0e8
parent8f33657dae91e6d7b329f3e0d0a5aa5cd4db672e
parent653b8ef24b3b588db68dda12bd0ca49eb8b9445c
Merge branch 'MDL-54879-master' of git://github.com/junpataleta/moodle