Merge branch 'wip-MDL-33377-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 May 2012 07:40:36 +0000 (15:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 May 2012 07:40:36 +0000 (15:40 +0800)
commit02796eab6924b10d93571a3ad28761e2d9b1e10f
treec1d9a9ccca0b94658af7025ccff7db6639b59652
parent786cd60ee3acf126ddae692e0efacb08412aa669
parentf92b65e5a601c1badda7847d228e5a8cd53b61cf
Merge branch 'wip-MDL-33377-master' of git://github.com/marinaglancy/moodle