Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle
commit1f95c9a4afdb1c6ccbd41b6cc6821b92b59ceb16
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 16:55:40 +0000 (21 17:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 16:55:40 +0000 (21 17:55 +0100)
tree921a7403b2878ef7a45c9c2586f2981f50ef0271
parent1997d9dc1d3c58b9b42357d91bc60910cbb67766
parentcd278cd454d7fe5a71fed6737b6b6ebba9f335c7
Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle