Merge branch 'MDL-52004-master' of git://github.com/damyon/moodle
commit01451bbc5a2ca594e4f8e3dc7e1a57e117919f49
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 05:38:07 +0000 (4 13:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 05:38:07 +0000 (4 13:38 +0800)
tree33c9549ef1b112eed10365cbd0530b66144fc242
parent99b9751f0d5b49d86a7f5c94b34f8edce01e112d
parentcfca338d7aa6d0096b31d5ec3e5fc5828f3e8fac
Merge branch 'MDL-52004-master' of git://github.com/damyon/moodle