Merge branch 'MDL-28587_master' of git://github.com/kordan/moodle
commit9e4b5b45a497cc251a27febda31599d640eb35ef
authorSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 05:43:42 +0000 (8 13:43 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 8 Aug 2011 05:43:42 +0000 (8 13:43 +0800)
treea6c50b65e2ef3fb4be0294fded2bfcc4b13258aa
parenta3ff929807af559c20bcacd3a686ba688b86736b
parent3f5235301647b9bee56dfde88b2a015dea4264aa
Merge branch 'MDL-28587_master' of git://github.com/kordan/moodle