Merge branch 'patch-11' of https://github.com/sk-unikent/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 04:34:28 +0000 (12:34 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:05 +0000 (09:31 +0000)
commit6009fa550cb3f7d381eaf5fe548c632a229bc046
tree211fa01a21c6c4a4a2fb8b640053617f46beea58
parentae39b423370330f74f86fbe18ece7e501027dde1
parentee4320a6fcc742d967e8b728a8a283ef2932a229
Merge branch 'patch-11' of https://github.com/sk-unikent/moodle