Merge branch 'MDL-47419-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 21:35:47 +0000 (10:35 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 21:35:47 +0000 (10:35 +1300)
commitff28497a1d8e4bbc6e2c343acc3d11a600738436
treecee0e15bb36b15b127dbe335d7505a1894ed47ac
parentc8398fb95af3533a1945e0b4f45ac939f3044d8d
parentd31cc93876af8456dd95759184aedf74649263a6
Merge branch 'MDL-47419-master' of git://github.com/ankitagarwal/moodle