Merge branch 'wip_MDL-40778_v2' of https://github.com/jamiepratt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Jul 2013 06:26:35 +0000 (14:26 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Jul 2013 06:26:35 +0000 (14:26 +0800)
commit5432ccec646b48ce34e634b5d8972afb03522ef7
tree307ab7c02c1791b8a485bd5136ae434d56004de7
parent7ea41b4a94da069855821586a7466370c02c826d
parent09ff04bcfec73ac88e3eb1f92ab06f5967f5eedf
Merge branch 'wip_MDL-40778_v2' of https://github.com/jamiepratt/moodle