Merge branch 'MDL-47587' of git://github.com/jmvedrine/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Nov 2014 20:18:36 +0000 (09:18 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Nov 2014 20:18:36 +0000 (09:18 +1300)
commit756350b82d0267217d34a9acf087326bc7919afb
treef3285b13d7570195bcf6bd3e7c40d669594c19dd
parenta2633964865e1073e473e7b0ad580e6e9db13e3b
parent31f386732b87614a5e5d0f6974a723eba36e2d45
Merge branch 'MDL-47587' of git://github.com/jmvedrine/moodle