Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 6 Jan 2014 01:19:11 +0000 (14:19 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 6 Jan 2014 01:19:11 +0000 (14:19 +1300)
commit8e06909afdb87e728130342013f2b7851b665a75
treec83ee8bcf3db4bb87a48c66f492209d711656c9f
parent98f0074fc59d40904016f8c794979a12fe51a201
parent3e5226ab6e649d12e8d5518df2ad6dada0bb2aef
Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle