Merge branch 'MDL-26788_head' of git://github.com/rwijaya/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 May 2011 09:18:22 +0000 (11:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 May 2011 09:18:22 +0000 (11:18 +0200)
commit5f0ac7652b2fa9050b860b8081b0db1053e0838e
treead5294dbf027e57d9e2f8a389d01a8d2d67a4bda
parent99b15d4438f6fb069709c24f4b6189d5987969ad
parentf672e3e920fcb36fcb723b72dd742456a038c461
Merge branch 'MDL-26788_head' of git://github.com/rwijaya/moodle