Merge branch 'MDL-36608_master' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:24:39 +0000 (14:24 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 01:24:39 +0000 (14:24 +1300)
commitd60ac860ea9af8db0c28bc679687246f754af6d0
treed4ab6ced2f13bdc86b369c56556aaaa6efdd6b1e
parent018e659061138b75f0f68a9b23cbbca5977511d3
parente64be8f52fc4114030ebdb172d66c1f6098f4b51
Merge branch 'MDL-36608_master' of git://github.com/lazydaisy/moodle