Merge branch 'MDL-50893' of git://github.com/timhunt/moodle
commitb7fafb5aaec29b6202c915485cb1d51bf085f44c
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 07:59:05 +0000 (4 15:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 07:59:05 +0000 (4 15:59 +0800)
treef8e08e244887b9263cca2f9cb26902e292abe1d9
parent719af68938131ae48b81ac4af2b63af355c29184
parent1f17e41e9aab3651748f17150dab614af76fc88d
Merge branch 'MDL-50893' of git://github.com/timhunt/moodle