Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 15:38:19 +0000 (16:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 15:38:19 +0000 (16:38 +0100)
commit1997d9dc1d3c58b9b42357d91bc60910cbb67766
tree7eb99ae282adcef3040725d7b5315a3c2781529e
parentc0c232ab63790399f6ae071dbcaeb7b367bb28d5
parent4c1638c10fd3fc313f9e18c779f48736e78249df
Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle