Merge branch 'w12_MDL-29894_m23_objectparams' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Mar 2012 08:40:28 +0000 (16:40 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Mar 2012 08:40:28 +0000 (16:40 +0800)

Trivial merge