Merge branch 'MDL-52309' of https://github.com/smbader/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 01:33:36 +0000 (09:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 01:33:36 +0000 (09:33 +0800)
commit8d9b6ec2547a588894b3a225ba55a5b5754eb44b
treea84b3066d0f2b0d0ec27c89998912124ee002605
parente8d5100212a925d095f8ca973442634ecbf4bec4
parent1dabeb8439c88f0737770642ad4ff61b6c04acb7
Merge branch 'MDL-52309' of https://github.com/smbader/moodle