Merge branch 'MDL-26250-final6' of github.com:mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 4 May 2011 10:04:10 +0000 (18:04 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 4 May 2011 10:04:10 +0000 (18:04 +0800)
commit280b1b21c0dc5193b09b8d5c3388abfb27f03cd5
tree8e5b728197f9aa682e1be4ba4bda81b5d0147507
parent5f0ac7652b2fa9050b860b8081b0db1053e0838e
parent543967a9e8ce2d69c1a08e6afd617a7734996529
Merge branch 'MDL-26250-final6' of github.com:mouneyrac/moodle