Merge branch 'MDL-46084-master' of https://github.com/sbourget/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 22:28:26 +0000 (11:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 22:28:26 +0000 (11:28 +1300)
commit6caf85e6d658b6e1aa0be3955d851eba410ec21a
treeebe6f09207becc58b30944e1e669016bd838eac4
parentff28497a1d8e4bbc6e2c343acc3d11a600738436
parentaccc3ced1aabc408af4c4ef2974c3897abe2aa03
Merge branch 'MDL-46084-master' of https://github.com/sbourget/moodle