Merge branch 'MDL-31164' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 05:08:39 +0000 (13:08 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 05:08:39 +0000 (13:08 +0800)
commitfbdc15536020551c8507f45588d002d4cdc55f55
treed218716994cf0fb0d4eedf20129905e6ae9bfa74
parent55cf5f8e75b1c68f30516f2542902f4ee6429960
parent3922c906b9a67ce1fe55dd689e0038e331c9d5ed
Merge branch 'MDL-31164' of git://github.com/lazydaisy/moodle