Merge branch 'MDL-31144' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 05:16:44 +0000 (13:16 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 05:16:44 +0000 (13:16 +0800)
commit8a4c5170a5e048a607cd14dd81b07cfa0af2b66b
tree7bb54593e2a5269bee9275e49eb6eedeafeaa8d4
parentfbdc15536020551c8507f45588d002d4cdc55f55
parent08be319445246864b5217a543240dbd0d74aa43f
Merge branch 'MDL-31144' of git://github.com/lazydaisy/moodle