Merge branch 'MDL-48362-master-fix2' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 06:31:29 +0000 (14:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Mar 2016 06:31:29 +0000 (14:31 +0800)
commit5d1a34b076ba27578d171ae41e4d3c8ecea6bb31
tree8caa9fc7335750f8506fcb5aa7c3b7ea222a5366
parent21d43c12b9ca94c474d00870abf073eb85786721
parent74aece8719ecb07342c523fedf9cdb0a165e4f4e
Merge branch 'MDL-48362-master-fix2' of github.com/damyon/moodle