Merge branch 'MDL-49791-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 08:07:11 +0000 (16:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Aug 2015 08:07:11 +0000 (16:07 +0800)
commit673b3c730b1cbe51acd03a0e11066341268bd656
tree62593a2b71a44052a229a25a099bdb72104d1a75
parentb7fafb5aaec29b6202c915485cb1d51bf085f44c
parent091881103784f127ffbb3501b8904f4c1bbf93af
Merge branch 'MDL-49791-master' of git://github.com/jleyva/moodle