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)

Trivial merge