Merge branch 'MDL-52586-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:06:03 +0000 (09:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jan 2016 01:06:03 +0000 (09:06 +0800)
commit38c6a307ebb481bb6ab0dda4a17bb5d32619e78c
tree565d237411f0bd57f8843c5666199559905ca07a
parent64858d435c50da341a6fba3445d7751bd01a82fa
parent333e77703dc8c1456244da44948091908f207e9a
Merge branch 'MDL-52586-master' of git://github.com/jleyva/moodle