Merge branch 'MDL-52507_master' of https://github.com/jinhofer/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:07:13 +0000 (09:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:07:13 +0000 (09:07 +0800)
commit9ef638652b82e2fd7da54ad407d5f4b9cd37c070
tree92e80d60fdd3397f3100238d3c307e2779181dd9
parent38c6a307ebb481bb6ab0dda4a17bb5d32619e78c
parent93172318b7805497c76e5c08724345467da986d1
Merge branch 'MDL-52507_master' of https://github.com/jinhofer/moodle