Merge branch 'MDL-3971' of git://github.com/danpoltawski/moodle
commitf7dc4a56303c983d9dec28475c07abcf5076be57
authorSam Hemelryk <sam@moodle.com>
Tue, 19 Jun 2012 23:39:59 +0000 (20 11:39 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 19 Jun 2012 23:39:59 +0000 (20 11:39 +1200)
treeab5b1bc6f8cf2957b193710d0176b4fea5b70057
parent1e3d84785a315d09b1642c45d32b7f807e7868df
parentdd4502af6bedab6627404a46005856fe267618aa
Merge branch 'MDL-3971' of git://github.com/danpoltawski/moodle