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)
commit149da7724b5bd27f2e546f198268f0881133c6cd
treeb21fcd27c47d5565e052a5761bf6713e1398f2dd
parent0e5c50e29aed56a49a61c0b945f9dd67a540783e
parente618cdf3f6849732a3f0b7bdc64a66f2de8df456
Merge branch 'w12_MDL-29894_m23_objectparams' of git://github.com/skodak/moodle