Merge branch 'MDL-57634-m' of https://github.com/micaherne/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Jan 2017 04:36:45 +0000 (12:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 18 Jan 2017 04:36:45 +0000 (12:36 +0800)
commit81c226d451017aa5e560a3a3c788a2da55f41bdb
tree362e394944949d190a7abaea88da1cb48eee7d96
parent40566af6d5b70d033ecaf2ab0c477d0277132fe1
parent55b2a33ce1363075abcd9ce46a7d06009c257adf
Merge branch 'MDL-57634-m' of https://github.com/micaherne/moodle