Merge branch 'w11_MDL-25352_20_replace' of git://github.com/skodak/moodle
commit5869d05bb7837ccaaabbc29a6a87f7e5f5c48e36
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Mar 2011 00:10:35 +0000 (14 01:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Mar 2011 00:10:35 +0000 (14 01:10 +0100)
treec9e48ce86851339250e47666d9b6c2dc165b62a7
parent2b1a23a6aad1a8e7d5dfffc2d842726e8cd839b2
parentc3b5e8290bd231dd80d4562834f6e108a390320d
Merge branch 'w11_MDL-25352_20_replace' of git://github.com/skodak/moodle