Merge branch 'wip-MDL-30270-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Nov 2011 21:39:02 +0000 (10:39 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Nov 2011 21:39:02 +0000 (10:39 +1300)
commit495bcb06d14e453298d209a317ba7c60e235463b
treeee8d913a17c54e1f905a61dd5b9950ba9e1dec80
parent2b72f6dc62191f0be3502be530af32da7cfbc032
parenta19d1057cab92e505a1ba3984bc67b6a2b66c5a8
Merge branch 'wip-MDL-30270-master' of git://github.com/marinaglancy/moodle