Merge branch 'MDL-44846-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Apr 2014 20:48:50 +0000 (08:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Apr 2014 20:48:50 +0000 (08:48 +1200)
commit2429e440116a9723d2f27c93d419631f0376640f
treec74660804913846facdc7008adc713e455d25f43
parent70aab3836a78fbcd2f14bf8197142a4d4e397f32
parentaf6a2e9459240a2384c359badb8d3cbc09b04560
Merge branch 'MDL-44846-master' of git://github.com/damyon/moodle