Merge branch 'MDL-30044-master' of git://github.com/ankitagarwal/moodle
commit3e4fb0cf81b2f33aca5656d6aca99b9b565d94d2
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Nov 2011 22:58:10 +0000 (8 11:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Nov 2011 22:58:10 +0000 (8 11:58 +1300)
treeafb1f60b63f1f32374d47038b7046640eff3a668
parentdaa1ed26cfe4d6f6760af1dfb8b5ba9d2216c61a
parente46cef0b64d3195585f4c421ad8bf34df490123f
Merge branch 'MDL-30044-master' of git://github.com/ankitagarwal/moodle