Merge branch 'MDL-30359' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 21:28:32 +0000 (10:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 21:28:32 +0000 (10:28 +1300)
commit7cdf3904a7c32478121429a8e9d5c894142c40f4
treeb445181e88d5aca344187b00a477d596b68c1c73
parentf218cdab344da12aa76bf1d5d0d53ea3487a0061
parent2062be1a015a2c0bb05c5647748c7ee04c50c0e8
Merge branch 'MDL-30359' of git://github.com/lazydaisy/moodle