Merge branch 'MDL-47474' of https://github.com/bostelm/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:52:17 +0000 (11:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 22:52:17 +0000 (11:52 +1300)
commit13f60ffce1a6b0ae9830a668e8125f76dc3904cc
treea2906dce829ac4d8028693088cb3a9dc9274abd9
parent28fffe1f9bd7ccb8dba5823d57849450ac8fb7e9
parented8adc7cf5895f6713847cd0f2c5bc06715b7296
Merge branch 'MDL-47474' of https://github.com/bostelm/moodle